--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -595,7 +595,7 @@
}
if ( aError == KErrEof || aError == KErrCancel )
{
- if ( IsPendingWriteInConnectedState() && !iCurrentRequest->NeedDisconnectNotification() )
+ if ( IsPendingWriteInConnectedState() && iCurrentRequest && !iCurrentRequest->NeedDisconnectNotification() )
{
// Server shut down the connect before the current transaction had
// a chance to send any of its data - attempt re-connect to server.
--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpresponseparser.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpresponseparser.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -226,8 +226,6 @@
iCancellingResponse = ETrue;
RHTTPTransaction trans = iProtTrans->Transaction();
RHTTPResponse response = trans.Response();
- if(iBodyParts.Count() > 0)
- iBodyParts.Remove(0);
iMessageParser.Flush ();
iMessageParser.Reset();
iCancellingResponse = EFalse;
@@ -660,9 +658,7 @@
if( !ConsumingResponse() )
{
- if( iBodyParts.Count() == 0 )
- iResponseObserver.ResponseComplete(aExcessData);
-
+ iResponseObserver.ResponseComplete(aExcessData);
if ( iCancellingResponse )
{
return;
--- a/applayerprotocols/httptransportfw/Test/testfilter/testhttpfilter.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/testfilter/testhttpfilter.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -18,7 +18,7 @@
#include <http/rhttpresponse.h>
#include <httperr.h>
#include <httpstringconstants.h>
-#include <imcvcodc.h> //for base64 en/decoding
+//#include <imcvcodc.h> //for base64 en/decoding
#include <bautils.h>
#include <e32math.h>
#include <hash.h>
--- a/httpfilters/cookie/FilterSrc/101F852E.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/FilterSrc/101F852E.rss Mon Mar 15 12:42:40 2010 +0200
@@ -17,7 +17,7 @@
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
RESOURCE REGISTRY_INFO theInfo
{
dll_uid = 0x101F852E;
--- a/httpfilters/cookie/FilterSrc/CookieFilterMain.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/FilterSrc/CookieFilterMain.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -19,7 +19,7 @@
#include <e32std.h>
#include <ecom/implementationproxy.h>
-#include "cookiefilter.h"
+#include "CookieFilter.h"
const TImplementationProxy KImplementationTable[] =
{
--- a/httpfilters/cookie/Group/CookieFilter.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/Group/CookieFilter.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -36,7 +36,7 @@
SOURCE CookieLogger.cpp
SOURCE CookieFilter.cpp
-START RESOURCE 101f852e.rss
+START RESOURCE 101F852E.rss
TARGET CookieFilter.rsc
END
--- a/httpfilters/cookie/Group/CookieManager.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/Group/CookieManager.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -35,13 +35,13 @@
SOURCE Cookie.cpp
SOURCE CookieArray.cpp
-SOURCE cookieIPC.cpp
-SOURCE cookielogger.cpp
-SOURCE cookiemanagermain.cpp
-SOURCE cookiemanagerserver.cpp
-SOURCE cookiemanagersession.cpp
+SOURCE CookieIPC.cpp
+SOURCE CookieLogger.cpp
+SOURCE CookieManagerMain.cpp
+SOURCE CookieManagerServer.cpp
+SOURCE CookieManagerSession.cpp
SOURCE CookieManagerClient.cpp
-SOURCE cookiemanagerstart.cpp
+SOURCE CookieManagerStart.cpp
SOURCE CookieServerPanic.cpp
--- a/httpfilters/cookie/Group/bld.inf Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/Group/bld.inf Mon Mar 15 12:42:40 2010 +0200
@@ -26,8 +26,8 @@
PRJ_EXPORTS
// iby
-../rom/CookieFilter.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CookieFilter.iby)
-../rom/CookieManager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CookieManager.iby)
+../Rom/CookieFilter.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CookieFilter.iby)
+../Rom/CookieManager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CookieManager.iby)
PRJ_MMPFILES
CookieManager.mmp
--- a/httpfilters/cookie/ManagerSrc/Cookie.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/Cookie.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -22,7 +22,7 @@
#include <httpstringconstants.h>
#include <http/rhttpheaders.h>
#include <http/rhttpsession.h>
-#include <Uri8.h>
+#include <uri8.h>
// User includes
#include "cookie.h"
--- a/httpfilters/cookie/ManagerSrc/CookieArray.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieArray.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -17,12 +17,12 @@
// INCLUDE FILES
// System includes
#include <http/thttphdrval.h>
-#include <Uri8.h>
+#include <uri8.h>
// User includes
#include "CookieArray.h"
#include "CookieCommonConstants.h"
-#include "cookielogger.h"
+#include "CookieLogger.h"
#include "CookieServerPanic.h"
// CONSTANTS
--- a/httpfilters/cookie/ManagerSrc/CookieManagerClient.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerClient.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -23,9 +23,9 @@
// User includes
#include "cookie.h"
-#include "cookieIPC.h"
+#include "cookieipc.h"
#include "CookieCommonConstants.h"
-#include "cookielogger.h"
+#include "CookieLogger.h"
#include "cookiemanagerclient.h"
#include "CookieManagerServer.h"
#include "CookieManagerStart.h"
--- a/httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -21,7 +21,7 @@
#include <e32std.h>
-#include <SysUtil.h>
+#include <sysutil.h>
// #include <thttphdrval.h>
// User includes
--- a/httpfilters/cookie/ManagerSrc/CookieManagerSession.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerSession.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -25,11 +25,11 @@
#include "CookieArray.h"
#include "CookieCommonConstants.h"
#include "cookieipc.h"
-#include "cookielogger.h"
-#include "cookiemanagerserver.h"
-#include "cookiemanagersession.h"
+#include "CookieLogger.h"
+#include "CookieManagerServer.h"
+#include "CookieManagerSession.h"
-#include "cookieserverdef.h"
+#include "CookieServerDef.h"
// ---------------------------------------------------------
--- a/httpfilters/deflatefilter/group/DeflateFilter.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/group/DeflateFilter.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -26,11 +26,11 @@
UID 0x10009D8D 0x101F9712
VENDORID VID_DEFAULT
-SOURCEPATH ../Src
+SOURCEPATH ../src
SOURCE DeflateFilterMain.cpp DeflateFilter.cpp DeflateDataSupplier.cpp StreamBufMgr.cpp DecmpStream.cpp
USERINCLUDE ../inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
--- a/httpfilters/deflatefilter/inc/DecmpStream.h Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/inc/DecmpStream.h Mon Mar 15 12:42:40 2010 +0200
@@ -20,7 +20,7 @@
#define __DECMPSTREAM_H_
//------------------------------------------------------------------------------
-#include <EZGzip.h>
+#include <ezgzip.h>
//------------------------------------------------------------------------------
class EZDecompressor;
--- a/httpfilters/deflatefilter/inc/StreamBufMgr.h Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/inc/StreamBufMgr.h Mon Mar 15 12:42:40 2010 +0200
@@ -21,7 +21,7 @@
//------------------------------------------------------------------------------
#include <e32base.h>
-#include <EZBufMan.h>
+#include <ezbufman.h>
//------------------------------------------------------------------------------
class CGzipStream;
--- a/httpfilters/deflatefilter/src/101F9712.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/src/101F9712.rss Mon Mar 15 12:42:40 2010 +0200
@@ -21,7 +21,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/deflatefilter/src/DecmpStream.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/src/DecmpStream.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -18,7 +18,7 @@
*/
#include <s32mem.h>
-#include <EZDecompressor.h>
+#include <ezdecompressor.h>
#include "StreamBufMgr.h"
#include "DecmpStream.h"
//-----------------------------------------------------------------------------
--- a/httpfilters/deflatefilter/src/DeflateFilter.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/src/DeflateFilter.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -21,7 +21,7 @@
#include <http/rhttptransaction.h>
#include <http/rhttpheaders.h>
#include <http/rhttpresponse.h>
-#include <HttpStringConstants.h>
+#include <httpstringconstants.h>
#include "DeflateFilter.h"
#include <bautils.h>
#include <eikenv.h>
--- a/httpfilters/deflatefilter/src/StreamBufMgr.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/deflatefilter/src/StreamBufMgr.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -17,7 +17,7 @@
*
*/
-#include <EZStream.h>
+#include <ezstream.h>
#include "StreamBufMgr.h"
//-----------------------------------------------------------------------------
--- a/httpfilters/group/bld.inf Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/group/bld.inf Mon Mar 15 12:42:40 2010 +0200
@@ -17,7 +17,7 @@
#include "../httpfiltercommon/group/bld.inf"
-#include "../cookie/group/bld.inf"
+#include "../cookie/Group/bld.inf"
#include "../deflatefilter/group/bld.inf"
#include "../httpfilteracceptheader/group/bld.inf"
#include "../httpfilterauthentication/group/bld.inf"
--- a/httpfilters/httpfilteracceptheader/Data/101F8566.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/Data/101F8566.rss Mon Mar 15 12:42:40 2010 +0200
@@ -17,7 +17,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilteracceptheader/Src/HttpFilterAcceptHeader.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/Src/HttpFilterAcceptHeader.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -22,18 +22,18 @@
#include <bldvariant.hrh>
-#include "FeatMgr.h"
+#include "featmgr.h"
// User Includes
#include "HttpFilterAcceptHeader.h"
#include "httpfiltercommonstringsext.h"
#include "HttpFilterAcceptHeaderVariant.hrh"
-#include <SysLangUtil.h>
+#include <syslangutil.h>
#include <centralrepository.h>
#include <HttpFilterAcceptHeaderPrivateCRKeys.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
// EXTERNAL FUNCTION PROTOTYPES
--- a/httpfilters/httpfilteracceptheader/group/HttpFilterAcceptHeader.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/group/HttpFilterAcceptHeader.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -26,8 +26,8 @@
CAPABILITY CAP_ECOM_PLUGIN
-USERINCLUDE ../inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../Inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
--- a/httpfilters/httpfilterauthentication/Data/101F8493.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterauthentication/Data/101F8493.rss Mon Mar 15 12:42:40 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterauthentication/Src/HttpFilterAuthentication.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterauthentication/Src/HttpFilterAuthentication.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include <e32std.h>
#include <e32math.h>
-#include <Uri8.h>
+#include <uri8.h>
#include <http/rhttpsession.h>
#include <http/rhttptransaction.h>
#include <http/rhttpheaders.h>
--- a/httpfilters/httpfilterauthentication/group/HttpFilterAuthentication.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterauthentication/group/HttpFilterAuthentication.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -28,7 +28,7 @@
UID 0x10009D8D 0x101F8493
USERINCLUDE ../Inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
@@ -40,7 +40,7 @@
SOURCEPATH ../Data
-START RESOURCE 101f8493.rss
+START RESOURCE 101F8493.rss
TARGET HttpFilterAuthentication.rsc
END
--- a/httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -28,15 +28,15 @@
#if defined(ARMCC)
deffile EABI/HttpFilterCommon.def
#elif defined( WINSCW )
-deffile Bwinscw/HttpFilterCommon.def
+deffile BWINSCW/HTTPFILTERCOMMON.DEF
#elif defined( WINS )
deffile Bwins/HttpFilterCommon.def
#else
-deffile Bmarm/HttpFilterCommon.def
+deffile BMARM/HTTPFILTERCOMMON.DEF
#endif
-SOURCEPATH ../Src
+SOURCEPATH ../src
SOURCE HttpFilterCommonStringsAddition.cpp
SOURCE HttpFilterCommonStringsExt.cpp
SOURCE HttpFilterCommonMain.cpp
--- a/httpfilters/httpfilterconnhandler/Data/101F8585.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Data/101F8585.rss Mon Mar 15 12:42:40 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterconnhandler/Src/HttpFilterConnHandler.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Src/HttpFilterConnHandler.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -22,7 +22,7 @@
#include <es_sock.h>
#include <ApEngineConsts.h> // defines bearer types
-#include "httpfilterConnHandler.h"
+#include "HttpFilterConnHandler.h"
#include "HttpFilterConnHandlerObserverPS.h"
#include <PSVariables.h> // Publish & Subscribe
--- a/httpfilters/httpfilterconnhandler/Src/httpfilterconnhandlerObserverPS.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Src/httpfilterconnhandlerObserverPS.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -20,10 +20,10 @@
// INCLUDE FILES
#include <es_sock.h>
#include <PSVariables.h> // Publish & Subscribe
-#include <MmTsy_names.h>
+#include <mmtsy_names.h>
// User Includes
-#include "httpfilterConnHandlerObserverPS.h"
+#include "HttpFilterConnHandlerObserverPS.h"
#include "mconnectioncallback.h"
// #include <flogger.h>
//_LIT(KDir, "connFilter");
--- a/httpfilters/httpfilterconnhandler/group/bld.inf Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/group/bld.inf Mon Mar 15 12:42:40 2010 +0200
@@ -34,6 +34,6 @@
// released. Specify "ignore" if the MMP file exists but should be
// ignored.
// Example:
-./httpFilterConnHandler.mmp
+./httpfilterConnHandler.mmp
// End of File
--- a/httpfilters/httpfilterconnhandler/group/httpfilterConnHandler.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/group/httpfilterConnHandler.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -26,16 +26,16 @@
CAPABILITY CAP_ECOM_PLUGIN
USERINCLUDE ../Inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../Src
-SOURCE httpFilterConnHandler.cpp
+SOURCE HttpFilterConnHandler.cpp
SOURCE HttpFilterConnHandlerMain.cpp
-SOURCE httpFilterConnHandlerObserverPS.cpp
+SOURCE httpfilterconnhandlerObserverPS.cpp
SOURCEPATH ../Data
--- a/httpfilters/httpfilteriop/Data/101F8592.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteriop/Data/101F8592.rss Mon Mar 15 12:42:40 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilteriop/Src/HttpFilterIop.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteriop/Src/HttpFilterIop.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -22,7 +22,7 @@
#include <es_sock.h>
// User Includes
-#include "httpfilterIop.h"
+#include "HttpFilterIop.h"
#include "httpfiltercommonstringsext.h"
#include "MIopRedirectCallback.h"
--- a/httpfilters/httpfilteriop/group/bld.inf Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteriop/group/bld.inf Mon Mar 15 12:42:40 2010 +0200
@@ -35,6 +35,6 @@
// released. Specify "ignore" if the MMP file exists but should be
// ignored.
// Example:
-./httpFilterIop.mmp
+./httpfilterIop.mmp
// End of File
--- a/httpfilters/httpfilteriop/group/httpfilterIop.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilteriop/group/httpfilterIop.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -27,13 +27,13 @@
CAPABILITY CAP_ECOM_PLUGIN
USERINCLUDE ../Inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../Src
-SOURCE httpFilterIop.cpp
+SOURCE HttpFilterIop.cpp
SOURCE HttpFilterIopMain.cpp
SOURCEPATH ../Data
--- a/httpfilters/httpfilterproxy/Data/101FD666.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterproxy/Data/101FD666.rss Mon Mar 15 12:42:40 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterproxy/Src/HttpFilterProxy.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterproxy/Src/HttpFilterProxy.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -24,7 +24,7 @@
#include <commdbconnpref.h>
// User Includes
-#include "httpfilterproxy.h"
+#include "HttpFilterProxy.h"
#include "httpfiltercommonstringsext.h"
// EXTERNAL DATA STRUCTURES
--- a/httpfilters/httpfilterproxy/group/bld.inf Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterproxy/group/bld.inf Mon Mar 15 12:42:40 2010 +0200
@@ -35,6 +35,6 @@
// released. Specify "ignore" if the MMP file exists but should be
// ignored.
// Example:
-./httpFilterProxy.mmp
+./httpfilterproxy.mmp
// End of File
--- a/httpfilters/httpfilterproxy/group/httpfilterproxy.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/httpfilterproxy/group/httpfilterproxy.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -28,13 +28,13 @@
CAPABILITY CAP_ECOM_PLUGIN
USERINCLUDE ../Inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
SOURCEPATH ../Src
-SOURCE httpFilterProxy.cpp
+SOURCE HttpFilterProxy.cpp
SOURCE HttpFilterProxyMain.cpp
SOURCEPATH ../Data
--- a/httpfilters/uaproffilter/group/uaproffilter.mmp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/uaproffilter/group/uaproffilter.mmp Mon Mar 15 12:42:40 2010 +0200
@@ -28,12 +28,12 @@
SOURCEPATH ../src
SOURCE uaproffilter.cpp
-SOURCE dllentrypoint.cpp
+SOURCE DllEntryPoint.cpp
MW_LAYER_SYSTEMINCLUDE
USERINCLUDE ../inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
START RESOURCE 101f8539.rss
TARGET uaproffilter.rsc
--- a/httpfilters/uaproffilter/src/101f8539.rss Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/uaproffilter/src/101f8539.rss Mon Mar 15 12:42:40 2010 +0200
@@ -18,7 +18,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
// -----------------------------------------------------------------------------
--- a/httpfilters/uaproffilter/src/uaproffilter.cpp Fri Mar 12 15:45:46 2010 +0200
+++ b/httpfilters/uaproffilter/src/uaproffilter.cpp Mon Mar 15 12:42:40 2010 +0200
@@ -30,7 +30,7 @@
#include <http/rhttpheaders.h>
#include <httperr.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
#include <webutilsinternalcrkeys.h>//for the profile strings
#include <cuseragent.h>
--- a/layers.sysdef.xml Fri Mar 12 15:45:46 2010 +0200
+++ b/layers.sysdef.xml Mon Mar 15 12:42:40 2010 +0200
@@ -6,7 +6,7 @@
<systemModel>
<layer name="mw_layer">
<module name="netprotocols">
- <unit unitID="browsing_domain.netprotocols" mrp="" bldFile="&layer_real_source_path;/group" name="netprotocols"/>
+ <unit unitID="netdo.netprotocols" mrp="" bldFile="&layer_real_source_path;/group" name="netprotocols"/>
</module>
</layer>
</systemModel>