# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1274782640 -10800 # Node ID f21293830889c53a45e4e9449f3cd79a7237f84f # Parent 8f055b80aa5b2054c7beccf0bfaa4cad30360ead Revision: 201019 Kit: 2010121 diff -r 8f055b80aa5b -r f21293830889 applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp --- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp Tue May 25 13:17:20 2010 +0300 @@ -316,9 +316,12 @@ return iObserver->SendTimeOutVal(); } -void CHttpRequestBatcher::SetTCPCorking(TBool /* aValue */) +void CHttpRequestBatcher::SetTCPCorking(TBool aValue ) { - + if (iOutputStream) + { + iOutputStream->SetTCPCorking(aValue); + } } diff -r 8f055b80aa5b -r f21293830889 applayerpluginsandutils/uripermissionservices/Test/tineturilistserverunit.cpp --- a/applayerpluginsandutils/uripermissionservices/Test/tineturilistserverunit.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerpluginsandutils/uripermissionservices/Test/tineturilistserverunit.cpp Tue May 25 13:17:20 2010 +0300 @@ -100,11 +100,11 @@ RSqlDatabase::Delete ( KDatabaseName() ); } -LOCAL_C void TestUriListInitializerL () +/*LOCAL_C void TestUriListInitializerL () { gListInterface = CUriListInterface::NewL (); // delete listInterface; - } + }*/ LOCAL_C CInetUriImpl* CreateUriL ( const TDesC8& aUri, TListType aListType, const TDesC8& aFavouriteName ) { @@ -183,10 +183,10 @@ return uri; } -LOCAL_C void CountUriL () +/*LOCAL_C void CountUriL () { gTestWrapper->TEST ( gListInterface->CountUriL ( InetUriList::EBrowser, InetUriList::EWhiteList ) == 1 ); - } + }*/ LOCAL_C void MatchUris ( const CInetUriImpl& aUri, const CInetUriImpl& aUri2 ) { @@ -240,10 +240,11 @@ RemoveTestL ( uri3, KErrNone ); CInetUriImpl* uri4 = NULL; TRAP ( err, uri4 = OpenUriL ( KTestUri() ) ); + CleanupStack::PushL ( uri4 ); __LEAVEIFOOM__ gTestWrapper->TEST ( err == KErrUriNotFound ); - CleanupStack::PopAndDestroy (4); //uri, uri2, uri3, gListInterface + CleanupStack::PopAndDestroy (5); //uri, uri2, uri3, uri4, gListInterface } LOCAL_C void AddMoreUrisTestL () diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httpservice/test/httpservicetest/ctestclienthttpget.cpp --- a/applayerprotocols/httpservice/test/httpservicetest/ctestclienthttpget.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httpservice/test/httpservicetest/ctestclienthttpget.cpp Tue May 25 13:17:20 2010 +0300 @@ -20,7 +20,6 @@ #include _LIT8(KAcceptHeader, "Accept"); _LIT8(KAcceptValue, "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); -_LIT(KTestHttpClientAPITestTitle, "HTTP client API Unit Test Harness"); _LIT(KTransferProgress, "File size: %d kb , Downloaded so far: %d kb"); CTestClientHttpSimpleGet* CTestClientHttpSimpleGet::NewL(CHttpClientTestParams& aParams, MLocalTestServerObserver& aObserver, CHttpService& aClient, const TDesC8& aUri, CHTTPTestUtils* aUtils) diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httpservice/test/httpservicetest/ctestclienthttppost.cpp --- a/applayerprotocols/httpservice/test/httpservicetest/ctestclienthttppost.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httpservice/test/httpservicetest/ctestclienthttppost.cpp Tue May 25 13:17:20 2010 +0300 @@ -18,7 +18,6 @@ #include #include "mlocaltestserverobserver.h" #include "chttpclienttestparams.h" -_LIT(KTestHttpClientAPITestTitle, "HTTP client API Unit Test Harness"); _LIT(KTransferProgress, "File size: %d kb , Uploaded so far: %d kb"); CTestClientHttpSimplePost* CTestClientHttpSimplePost::NewL(CHttpClientTestParams& aParams, MLocalTestServerObserver& aObserver, CHttpService& aClient, const TDesC8& aUri, CHTTPTestUtils& aUtils) diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httpservice/test/httpservicetest/ctesthttpclientstep.cpp --- a/applayerprotocols/httpservice/test/httpservicetest/ctesthttpclientstep.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httpservice/test/httpservicetest/ctesthttpclientstep.cpp Tue May 25 13:17:20 2010 +0300 @@ -52,7 +52,6 @@ // TEF virtuals TVerdict CTestHttpClientStep::doTestStepPreambleL() { - TInt status; iActiveScheduler = new (ELeave) CActiveScheduler(); CActiveScheduler::Install(iActiveScheduler); iTestParamArray = new(ELeave) CHttpClientTestParamArray; @@ -66,7 +65,7 @@ connPref.SetIapId(1); connPref.SetNetId(0); iHttpConnInfo = iHttpClient->HttpNetworkConnection(); - status = iHttpConnInfo->Start(); + User::LeaveIfError(iHttpConnInfo->Start()); THttpHeaderValueVariant variant(KUserAgent()); if(iHttpClient->AddRequestHeader(HTTP::EUserAgent, variant)) { diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httpservice/test/httpservicetest/ctesthttpserviceauthentication.cpp --- a/applayerprotocols/httpservice/test/httpservicetest/ctesthttpserviceauthentication.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httpservice/test/httpservicetest/ctesthttpserviceauthentication.cpp Tue May 25 13:17:20 2010 +0300 @@ -16,9 +16,7 @@ #include #include "ctesthttpserviceauthentication.h" -_LIT(KAuthURL, "Passing credentials for URL %S, realm %S\n"); -_LIT(KAuthType, "Using %S authentication\n"); - + CTestHttpServiceAuthentication::~CTestHttpServiceAuthentication() { } diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httpservice/test/httpservicetest/ctestserverstreammanager.cpp --- a/applayerprotocols/httpservice/test/httpservicetest/ctestserverstreammanager.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httpservice/test/httpservicetest/ctestserverstreammanager.cpp Tue May 25 13:17:20 2010 +0300 @@ -20,9 +20,6 @@ #include "chttpclienttestparams.h" #include -const TUint KCarriageReturn = '\r'; -const TUint KLineFeed = '\n'; -const TUint KSpace = ' '; CLocalTestServerStreamManager* CLocalTestServerStreamManager::NewL(CHTTPTestUtils& aTestUtils, MInputStream* aInStream, MOutputStream* aOutStream, CHttpClientTestParamArray& aTestParamArray) { diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httptransportfw/Test/TestScriptTest/CPipeliningTestEngine.cpp --- a/applayerprotocols/httptransportfw/Test/TestScriptTest/CPipeliningTestEngine.cpp Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httptransportfw/Test/TestScriptTest/CPipeliningTestEngine.cpp Tue May 25 13:17:20 2010 +0300 @@ -538,7 +538,7 @@ iTestUtils->StartTestL( aTestCase.TestCaseName() ); __TESTNAME(aTestCase.TestCaseName()); - CPipeliningTestClient* testClient; + CPipeliningTestClient* testClient = NULL; if(aSecName.FindF(_L("TSWDEFECT")) ==0) { RDebug::Print(_L("TSWDEFECT")); @@ -546,6 +546,7 @@ if(aTestCase.TestCaseName().CompareF(KTestCaseLocalAndRemoteHost) == 0) { testClient = CTestCaseLocalAndRemoteHost::NewL(*iTestUtils, *this); + CleanupStack::PushL(testClient); } else { @@ -554,10 +555,10 @@ } else { - testClient = CPipeliningTestClient::NewL(*iTestUtils, *this); + testClient = CPipeliningTestClient::NewL(*iTestUtils, *this); + CleanupStack::PushL(testClient); } - CleanupStack::PushL(testClient); - + testClient->SetTestCase(&aTestCase); iTestServer->SetTestCase(&aTestCase); testClient->StartClientL(); diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httptransportfw/group/bld.inf --- a/applayerprotocols/httptransportfw/group/bld.inf Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httptransportfw/group/bld.inf Tue May 25 13:17:20 2010 +0300 @@ -42,7 +42,7 @@ ../inc/framework/crxdata.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/crxdata.h) ../inc/framework/cheadercodec.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/cheadercodec.h) ../inc/framework/CProtTransaction.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/cprottransaction.h) -../inc/framework/httplogger.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(http/framework/httplogger.h) +../inc/framework/httplogger.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/httplogger.h) ../inc/framework/MRxDataObserver.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/mrxdataobserver.h) ../inc/framework/RHeaderField.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/framework/rheaderfield.h) ../inc/framework/logging.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(http/framework/logging.h) @@ -77,7 +77,7 @@ ../inc/http/thttphdrfielditer.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/thttphdrfielditer.h) ../inc/http/thttpfilterhandle.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/thttpfilterhandle.h) ../inc/http/thttphdrval.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/thttphdrval.h) -../inc/http/mhttpdataoptimiser.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(http/mhttpdataoptimiser.h) +../inc/http/mhttpdataoptimiser.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(http/mhttpdataoptimiser.h) ../inc/http/thttptable.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(http/thttptable.h) ../httputils/inc/rexplicithttpsession.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(http/rexplicithttpsession.h) @@ -262,9 +262,6 @@ ../Test/Group/HTTPPipeliningTest.mmp ../Test/Group/HTTPIOPTest.mmp -// HTTP Test Filter -../Test/Group/testfilter.mmp - // Test HTTP Suite #include "../Test/Integration/group/bld.inf" diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httptransportfw/inc/framework/httplogger.h --- a/applayerprotocols/httptransportfw/inc/framework/httplogger.h Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httptransportfw/inc/framework/httplogger.h Tue May 25 13:17:20 2010 +0300 @@ -16,7 +16,7 @@ /** @file httplogger.h @warning : This file contains Rose Model ID comments - please do not delete - @publishedPartner + @publishedAll @released */ @@ -33,7 +33,7 @@ /** A utility used in HTTP for logging in debug builds. Log files are placed in the directory %EPOCROOT%/epoc32/wins/c/logs/http -@publishedPartner +@publishedAll @released */ { diff -r 8f055b80aa5b -r f21293830889 applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h --- a/applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h Tue May 11 16:43:01 2010 +0300 +++ b/applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h Tue May 25 13:17:20 2010 +0300 @@ -23,7 +23,7 @@ /** -@publishedPartner +@publishedAll @released */ class MHttpDataOptimiser diff -r 8f055b80aa5b -r f21293830889 httpfilters/cookie/data/CookieGroup.xml --- a/httpfilters/cookie/data/CookieGroup.xml Tue May 11 16:43:01 2010 +0300 +++ b/httpfilters/cookie/data/CookieGroup.xml Tue May 25 13:17:20 2010 +0300 @@ -5,6 +5,8 @@ + +