# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1282115899 -10800 # Node ID 4828f38c48f66f83151ab2667855440299873dc6 # Parent dd1f62411ef88df74a5b28d8e1dd10d465c1adf5 Revision: 201029 Kit: 201033 diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/ftpengine/ftptest/FTPTEST.H --- a/applayerprotocols/ftpengine/ftptest/FTPTEST.H Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/ftpengine/ftptest/FTPTEST.H Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -47,6 +47,7 @@ } LOCAL_C void InitCommsL() { +#ifndef SIROCCO_CODE_MIGRATION TInt err; err=User::LoadPhysicalDevice(PDD_NAME); @@ -56,6 +57,7 @@ err=User::LoadLogicalDevice(LDD_NAME); if (err!=KErrNone && err!=KErrAlreadyExists) User::Leave(err); +#endif //SIROCCO_CODE_MIGRATION } LOCAL_C void callExampleL() // initialize and call example code under cleanup stack diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httpexamples/httpexampleclient/httpexampleutils.cpp --- a/applayerprotocols/httpexamples/httpexampleclient/httpexampleutils.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httpexamples/httpexampleclient/httpexampleutils.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -35,6 +35,7 @@ void CHttpExampleUtils::InitCommsL() { +#ifndef SIROCCO_CODE_MIGRATION TInt ret = User::LoadPhysicalDevice(PDD_NAME); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); @@ -48,6 +49,7 @@ User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); ret = StartC32(); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); +#endif //SIROCCO_CODE_MIGRATION } diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/Test/Integration/src/testhttpbasestep.cpp --- a/applayerprotocols/httptransportfw/Test/Integration/src/testhttpbasestep.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/Test/Integration/src/testhttpbasestep.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -41,6 +41,7 @@ // Loads the physical device drivers void CTestHttpBaseStep::InitCommsL() { +#ifndef SIROCCO_CODE_MIGRATION TInt ret = User::LoadPhysicalDevice(PDD_NAME); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); @@ -54,6 +55,7 @@ User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); ret = StartC32(); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); +#endif //SIROCCO_CODE_MIGRATION } diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/Test/T_HttpIntegration/Gt0149.cpp --- a/applayerprotocols/httptransportfw/Test/T_HttpIntegration/Gt0149.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/Test/T_HttpIntegration/Gt0149.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/Test/t_utils/httptestutils.cpp --- a/applayerprotocols/httptransportfw/Test/t_utils/httptestutils.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/Test/t_utils/httptestutils.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -569,6 +569,7 @@ EXPORT_C void CHTTPTestUtils::InitCommsL() { +#ifndef SIROCCO_CODE_MIGRATION TInt ret = User::LoadPhysicalDevice(PDD_NAME); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); @@ -582,6 +583,7 @@ User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); ret = StartC32(); User::LeaveIfError(ret == KErrAlreadyExists?KErrNone:ret); +#endif //SIROCCO_CODE_MIGRATION } EXPORT_C void CHTTPTestUtils::HoldOpenConnectionL() diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/Test/t_utils/t_utils.cpp --- a/applayerprotocols/httptransportfw/Test/t_utils/t_utils.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/Test/t_utils/t_utils.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -40,6 +40,7 @@ void RHttpTestUtils::InitCommsL() { +#ifndef SIROCCO_CODE_MIGRATION TInt ret = User::LoadPhysicalDevice(PDD_NAME); User::LeaveIfError(ret); @@ -54,5 +55,6 @@ ret = StartC32(); User::LeaveIfError(ret); +#endif //SIROCCO_CODE_MIGRATION } diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/group/bld.inf --- a/applayerprotocols/httptransportfw/group/bld.inf Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/group/bld.inf Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -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) @@ -268,4 +268,3 @@ // Test HTTP Suite #include "../Test/Integration/group/bld.inf" - diff -r dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/inc/framework/httplogger.h --- a/applayerprotocols/httptransportfw/inc/framework/httplogger.h Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/inc/framework/httplogger.h Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2001-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -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 dd1f62411ef8 -r 4828f38c48f6 applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h --- a/applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h Tue Jul 06 14:51:44 2010 +0300 +++ b/applayerprotocols/httptransportfw/inc/http/mhttpdataoptimiser.h Wed Aug 18 10:18:19 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -23,7 +23,7 @@ /** -@publishedPartner +@publishedAll @released */ class MHttpDataOptimiser diff -r dd1f62411ef8 -r 4828f38c48f6 httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp --- a/httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp Tue Jul 06 14:51:44 2010 +0300 +++ b/httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp Wed Aug 18 10:18:19 2010 +0300 @@ -23,12 +23,13 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + // #include