# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283439327 -3600
# Node ID cdeb3bb916ccba82124e5bc53794e320e05dbaee
# Parent  a0da872af3fad3971d1f1c6b67c0615f3c86025e# Parent  7b05392fe9dc596ef7e097ca77602cf8e7eae6f9
Merge RCL_3 fixes with reverted delivery

diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/bookmarksupport/test/Integration/TestBookmarksSuite/bld.inf
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/101F55F6.rls
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpclienthandler.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpclienthandler.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpclienttransaction.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpclienttransaction.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpclient/chttpresponseparser.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httpprotocolplugins/httpheadercodec/chttpgeneralheaderwriter.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/group/httpsecuresocket.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/101f55ee.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/101f55f7.rls
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/101f55f7.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/chttptransportlayer.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/csecuresocketcontroller.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/csocket.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/csocketconnector.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/ctcptransportlayer.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/ctcptransportlayer.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/mcommsinfoprovider.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/httptransportplugins/httptransporthandler/mconnectionprefsprovider.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/cap_00000000_testwlistblisturi.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/cap_00000010_testwlistblisturi.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/cap_00000020_testwlistblisturi.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/cap_00000030_testwlistblisturi.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/testwlistblisturisuite.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/testwlistblisturisuite_add_security.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/tld_config_duplicate_test.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/tld_preconfigtest.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/tld_query_post-config_test.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/scripts/tld_query_preconfig_test.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/duplicate_entries/ineturilist.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/duplicate_entries/tldpolicy.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/ineturilist.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/max_upgradesis/ineturilist.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/max_upgradesis/tldpolicy.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/testldpolicy.ini
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/Test/integration/testwhitelistblacklisturisuite/testdata/tldpolicy.xml
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/group/bld.inf
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/group/ineturilist.iby
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/group/tineturilistserverunit.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/server/inc/urilistinterface.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/server/src/urilistinterface.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerpluginsandutils/uripermissionservices/stubSis/ineturilist_stub.pkg
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/ftpengine/ftptest/FTPTEST.H
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/PipeliningConfigFilter/FilterSrc/101F5600.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/T_TestFilters/101F447F.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/cookies/cookiefilter/1000A448.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/httpexampleclient/httpexampleutils.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/t_securitypolicy/test/101F4487.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/uaprof/uaproffilter/101F55E8.rls
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpexamples/uaprof/uaproffilter/101F55E8.rss
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/group/bld.inf
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/group/httpservice.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/inc/chttpclientauthentication.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/inc/chttpclienttransaction.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/inc/chttpservice.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/inc/httpservice.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/inc/mhttpserviceauthentication.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/src/chttpclientauthentication.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/src/chttpclienttransaction.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/src/chttpclienttransactionimpl.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/src/chttpservice.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/src/httpheaderiter.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/group/httpservicetest.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/chttpclienttestparams.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/chttpclienttestparams.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/clocaltestserver.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/clocaltestserver.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/ctesthttpclientstep.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/ctesthttpserviceauthentication.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/httpservicetest/ctesthttpserviceauthentication.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/testdata/ini/httpclient.ini
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httpservice/test/testdata/scripts/httpserviceapitest.script
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/Data/ini/online/UnitTests.ini
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/EABI/httptestutilsU.def
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/Group/T_HttpOnline.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/Group/testhttpmessage.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/Integration/src/testhttpbasestep.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpIntegration/Gt0149.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpOffline/t_hdrcodec.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpOffline/t_hdrcodec.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpOnline/t_httponline.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CRecvTimeOut.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestCasePipelineFallback.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestCasePipelineFallback.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestServerStreamManager.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestServerStreamManager.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/cpipeliningtestengine.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/cpipeliningtestserver.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/cpipeliningtestserver.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/ctestcase26.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/TestScriptTest/CPipeliningTestServer.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/TestScriptTest/CPipeliningTestServer.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/TestScriptTest/ctestcaselocalandremotehost.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/t_httptransporthandler/ctestengine.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/t_httptransporthandler/ctestengine.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/t_utils/ScriptFile.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/t_utils/httptestutils.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/t_utils/t_utils.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/testfilter/testhttpfilter.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/testhttpmessage/ctestengine.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/Test/testhttpmessage/testhttpmessage.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/core/CHeaderField.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/core/CTransaction.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/core/TFilterConfigurationIter.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/core/chttpformencoder.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/group/HttpClientErr.ra
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/group/bld.inf
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/group/httpcore.iby
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/inc/framework/httplogger.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h
diff -r 7b05392fe9dc -r cdeb3bb916cc applayerprotocols/httptransportfw/strings/HttpStringConstants.st
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerInc/CookieManagerSession.h
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerSrc/CookieClientDataArray.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerSrc/CookieGroupDataArray.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerSrc/CookieIPC.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerSrc/CookieManagerClient.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/group/bld.inf
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfilteracceptheader/Src/HttpFilterAcceptHeader.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfilterauthentication/Src/HttpFilterAuthentication.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfilterauthentication/Src/HttpFilterDigestAuthentication.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfiltercommon/src/HttpFilterCommonStringsExt.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfilterconnhandler/group/httpfilterConnHandler.mmp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/httpfilterproxy/Src/HttpFilterProxy.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc httpfilters/uaproffilter/src/uaproffilter.cpp
diff -r 7b05392fe9dc -r cdeb3bb916cc netprotocols_plat/http_cache_mgr_api/inc/httpcachemanager.h