--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -18,6 +18,7 @@
#include <authority8.h>
#include <httperr.h>
#include <x509cert.h>
+#include <sslerr.h>
#include "msocketfactory.h"
#include "msocketconnector.h"
@@ -585,9 +586,16 @@
);
}
#endif
- if ( ( aError == KErrEof || aError == KErrCancel ) )
+ if ((aError == KErrSSLAlertUnexpectedMessage || aError == KErrSSLAlertHandshakeFailure) && !iSecureRetry)
+ {
+ //TSW error id - TKOO-7YUCA3
+ //some websites dont support tls1.0 & retry secure negotiation with ssl3.0 & error value modified to KErrEof for retrying
+ iSecureRetry = ETrue;
+ aError = KErrEof;
+ }
+ 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.
@@ -1210,6 +1218,9 @@
void CHttpConnectionManager::SecureClientCnf()
{
__ASSERT_DEBUG( iState == EUpgrading, User::Invariant() );
+
+ iSecureRetry = EFalse; //reset the flag
+
#if defined (_DEBUG) && defined (_LOGGING)
__FLOG_0(_T8("!! Secure connection establised"));
--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpconnectionmanager.h Fri Apr 16 15:30:47 2010 +0300
@@ -128,6 +128,8 @@
void CheckRequestComplete(MHttpRequest& aRequest);
void DisablePipelining();
void AppendPipelineFailedHost(const TDesC8& aHost);
+ inline TBool SecureRetry(){ return iSecureRetry;}
+
private: // methods from MHttpRequestObserver
@@ -232,6 +234,7 @@
EDiscardSndDataCnf = 3
};
private:
+ TBool iSecureRetry;
TBool iEnableOptimalPipeline;
TBool iTunnel;
TInt iMaxTransactionsToPipeline;
--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -265,6 +265,11 @@
Cancel();
iObserver->OutputStreamCloseInd(aError);
}
+
+TBool CHttpRequestBatcher::SecureRetry()
+ {
+ return iObserver->SecureRetry();
+ }
void CHttpRequestBatcher::MOutputStreamObserver_Reserved()
{
--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttprequestbatcher.h Fri Apr 16 15:30:47 2010 +0300
@@ -54,6 +54,8 @@
virtual void Reset ();
+ TBool SecureRetry();
+
virtual void SetTCPCorking(TBool aValue);
private: // methods from MOutputStreamObserver
virtual void SendDataCnfL();
--- a/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpresponseparser.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httpprotocolplugins/httpclient/chttpresponseparser.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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,8 +658,7 @@
if( !ConsumingResponse() )
{
- if( iBodyParts.Count() == 0 )
- iResponseObserver.ResponseComplete(aExcessData);
+ iResponseObserver.ResponseComplete(aExcessData);
if ( iCancellingResponse )
{
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/chttpsecuresocket.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/chttpsecuresocket.h Fri Apr 16 15:30:47 2010 +0300
@@ -36,7 +36,7 @@
inline virtual ~CHttpSecureSocket();
- virtual void StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName) =0;
+ virtual void StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName,const TDesC& aProtocolVersion) =0;
virtual void RecvOneOrMore(TDes8& aBuffer, TRequestStatus& aStatus, TSockXfrLength& aLength) =0;
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/csecuresocketcontroller.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/csecuresocketcontroller.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -62,7 +62,7 @@
{
}
-void CSecureSocketController::StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName)
+void CSecureSocketController::StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName, const TDesC& aProtocolVersion)
/**
Start a secure handshake to upgrade the socket to a secure connection.
@param aStatus The request status, this will complete with KErrNone
@@ -72,10 +72,10 @@
*/
{
// Create the secure layer
- _LIT(KTxtTls, "tls1.0");
if( iTlsSocket == NULL )
- iTlsSocket = CSecureSocket::NewL(iSocket, KTxtTls());
-
+ {
+ iTlsSocket = CSecureSocket::NewL(iSocket, aProtocolVersion);
+ }
// Get the security preferences, dialog prompt and security policy
TBool dialogPref = ETrue;
MSecurityPolicy* securityPolicy = NULL;
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/csecuresocketcontroller.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/csecuresocketcontroller.h Fri Apr 16 15:30:47 2010 +0300
@@ -37,7 +37,7 @@
virtual ~CSecureSocketController();
- void StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName);
+ void StartSecureHandshakeL(TRequestStatus& aStatus, const TDesC8& aHostName,const TDesC& aProtocolVersion);
void RecvOneOrMore(TDes8& aBuffer, TRequestStatus& aStatus, TSockXfrLength& aLength);
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocket.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocket.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -344,7 +344,7 @@
return KErrNotSupported;
}
-void CSocket::UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName)
+void CSocket::UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName,const TDesC& aProtocol)
/**
Asynchronous request to upgrade the socket to a secure socket.
@param aStatus The request status, this will complete with KErrNone on the successful
@@ -368,7 +368,7 @@
User::Leave(KErrNotSupported);
else if (error != KErrNone)
User::Leave(error);
- iSecureSocketController->StartSecureHandshakeL(aStatus, aHostName);
+ iSecureSocketController->StartSecureHandshakeL(aStatus, aHostName,aProtocol);
}
}
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocket.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocket.h Fri Apr 16 15:30:47 2010 +0300
@@ -84,7 +84,7 @@
TInt CipherSuite(TDes8& aCipherSuite);
- void UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName);
+ void UpgradeToSecureL(TRequestStatus& aStatus, const TDesC8& aHostName,const TDesC& aProtocol);
void CancelUpgradeToSecure();
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocketwriter.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/csocketwriter.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -353,7 +353,16 @@
{
// Start the secure handshake
iState = ESecureHandshakeComplete;
- iSocket.UpgradeToSecureL(iStatus, iHostName);
+ _LIT(KTxtTls, "tls1.0");
+ _LIT(KTxtSsl,"ssl3.0");
+ if (!iObserver->SecureRetry())
+ {
+ iSocket.UpgradeToSecureL(iStatus, iHostName,KTxtTls()); //first negotiate with latest version of TLS
+ }
+ else
+ {
+ iSocket.UpgradeToSecureL(iStatus, iHostName,KTxtSsl()); //now try old ssl version
+ }
SetActive();
} break;
case ESecureHandshakeComplete:
--- a/applayerpluginsandutils/httptransportplugins/httptransporthandler/moutputstreamobserver.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerpluginsandutils/httptransportplugins/httptransporthandler/moutputstreamobserver.h Fri Apr 16 15:30:47 2010 +0300
@@ -114,7 +114,8 @@
virtual void OnSendTimeOut() =0;
virtual TInt SendTimeOutVal() =0;
-
+
+ virtual TBool SecureRetry()=0;
private: // methods
/**
--- a/applayerprotocols/httpservice/test/httpservicetest/ctestserverstreammanager.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httpservice/test/httpservicetest/ctestserverstreammanager.h Fri Apr 16 15:30:47 2010 +0300
@@ -49,6 +49,7 @@
// From MOutputStreamObserver
void SendDataCnfL();
void SecureClientCnf();
+ inline TBool SecureRetry(){ return EFalse;}
void OutputStreamCloseInd(TInt aError);
void MOutputStreamObserver_Reserved();
void OnSendTimeOut();
--- a/applayerprotocols/httptransportfw/Test/Data/certs/how-to add security certificate.txt Fri Mar 19 09:39:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-Title : how-to add security certificate for TLS clients
-Owner : Subramanian RS
-Date : 25-10-2005
-Copyright (C) Symbian Limited 2005 - 2006. All rights reserved.
---------------------------------------------------------------------------------------
-
-The following procedure need to be followed when the security certificate expires.
-
-1. If u are going to add 91 certificate then Download code from //EPOC/release/9.1/common/generic/security/ and if u are going to add 92 Certificate then download the code from //EPOC/master/common/generic/security/ ( download whole folder )
-
-2. Build the code in the following order.
- 1. Build security\testframework ( build only for test )
- 2. Build security\filetokens
- 3. Build secuirty\swi ( During build, it might show mspdb60.dll is missing. Add the folder path which contains this file in PATH environment variable. Normally, it will be available in <root>:\apps\MSVC6\Common\MSDev98\Bin )
- 4. Build security\certman
-
-3. The secure server page need to be opened with https://lon-cn-lxwaptest2.closedtest.intra ( The SecureServerName can be found in http\test\data\ini\settings.ini file. At the moment it is lon-cn-lxwaptest2.closedtest.intra ). Open the page in Internete Explorer. Click the "lock" icon found in the status bar. Go to "Details" tab. Click "Copy to File". Export the certificate information into a file. Save the file in winscw\c folder. Name the file as wapca2005.cer or ...
-
-4. Copy the file http\test\Data\certs\httptestcert.txt into winscw\c\tcertstore\scripts. Modify the file as follows.
- 1. <actionname>Set the trust for HTTP test cert</actionname>
- ...
- <label>wapca2005</label> ( Change the label name. In this case, it is wapca2005 )
- ...
- 2. <actionname>Get applications for HTTP test cert</actionname>
- ...
- <label>wapca2005</label> ( Change the label name. In this case, it is wapca2005 )
- ...
- 3. <actionname>Get applications for HTTP test cert</actionname>
- ...
- <label>wapca2005</label> ( Change the label name. In this case, it is wapca2005 )
- ...
-
-5. Copy the http\test\data\certs\addcert.txt into winscw\c\. Modify the file as follows
-
- 1. <actionname>Add the certificate wapca2005</actionname> ( Change the actionname description accordingly. )
- ...
- <certfile>c:\wapca2005.cer</certfile> ( Change the file path accordingly if the wapca2005.cer is saved in a different location )
- ...
- 2. <actionname>Set applications for wapca2005</actionname> ( Change the actionname description accordingly. )
- ...
- <label>wapca2005</label> ( Change the label name. )
- ...
-
-6. Run the test - t_certstore c:\addcert.txt c:\addcert.log. Check the log file for success/failure. This will generate cacerts.dat file in c\private\101f72a6.
-
-7. Run the test - t_certstore c:\tcertstore\scripts\httptestcert.txt c:\addclient.log. This will generate certclients.dat file in c\private\101f72a6.
-
-8. Copy cacerts.dat & certclients.dat into http\test\data\certs\. Modify the bld.inf, automated_httptest.iby, t_httponline.iby files accordingly and build the http component.
-
-For more information refer:
-1. //EPOC/master/common/generic/security/certman/documentation/Building a certificate store.rtf
-2. //EPOC/master/common/generic/security/certman/documentation/building-certstore.txt
-
-
-
--- a/applayerprotocols/httptransportfw/Test/Data/ini/online/UnitTests.ini Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/Data/ini/online/UnitTests.ini Fri Apr 16 15:30:47 2010 +0300
@@ -95,6 +95,9 @@
[INC120672_2]
NumSubTests= 1
+[PDEF143929]
+NumSubTests= 1
+
[100-ContinueTest]
NumSubTests= 1
--- a/applayerprotocols/httptransportfw/Test/Group/T_HttpOnline.mmp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/Group/T_HttpOnline.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -35,7 +35,7 @@
USERINCLUDE ../../inc/framework ../../../httpexamples/cookies/example ../../../httpexamples/testcpimanager
SOURCEPATH ../T_HttpOnline
SOURCE t_httponline.cpp T_CancelMultiTrans.cpp T_CancelSingleTrans.cpp T_MultiTrans.cpp T_MultiTransConcurrent.cpp CINC102380.cpp
-SOURCE T_PersistentConn.cpp T_PostBodyChunks.cpp T_RespChunkSize.cpp T_Proxies.cpp DEF079378.cpp CINC082448.cpp INC094209.cpp CINC097492.cpp cinc105767.cpp CINC097492_2.cpp CINC097492_3.cpp CINC097492_4.cpp CR1130.cpp crecvbufsizetest1.cpp crecvbufsizetest2.cpp
+SOURCE T_PersistentConn.cpp T_PostBodyChunks.cpp T_RespChunkSize.cpp T_Proxies.cpp DEF079378.cpp CINC082448.cpp INC094209.cpp CINC097492.cpp cinc105767.cpp CINC097492_2.cpp CINC097492_3.cpp CINC097492_4.cpp CR1130.cpp crecvbufsizetest1.cpp crecvbufsizetest2.cpp CPDEF143929.cpp
SOURCE T_Cookies.cpp T_UAProf.cpp T_MultiTransMalformedStatusLine.cpp
SOURCE T_SocketShutdownMode.cpp CINC110203.cpp cinc112633.cpp cinc112633_2.cpp
@@ -51,3 +51,4 @@
UID 0x1000007A 0x102729D3
SMPSAFE
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/httptransportfw/Test/T_HttpOnline/cpdef143929.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -0,0 +1,214 @@
+// Copyright (c) 2007-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// defines test class: CPDEF143929
+//
+//
+
+#include "CPDEF143929.h"
+#include "examplecookiemanager.h"
+#include <http/ccookiefilterinterface.h>
+
+// User include
+#include "csrvaddrval.h"
+
+// Literals used in the file
+
+// URL whose response status code is 200
+_LIT8(KHttpUrl, "http://www.pubblica.istruzione.it");
+
+/**
+ This function is called to create a new instance of the class
+ CPDEF143929
+
+ @param aTestNumber The test number that has to be executed
+ @param aIniSettingsFile The script file that holds the sections
+ from which the value has to be retrieved
+ @leave Leaves with a standard error
+*/
+CPDEF143929* CPDEF143929::NewL(TInt aTestNumber, CScriptFile* aIniSettingsFile)
+ {
+ CPDEF143929* self = new(ELeave)CPDEF143929(aTestNumber, aIniSettingsFile);
+ CleanupStack::PushL(self);
+ CleanupStack::Pop(self);
+ return self;
+ }
+
+/**
+ Destructor
+*/
+CPDEF143929::~CPDEF143929()
+ {
+ iTransArray.Close();
+ }
+
+/**
+ This C++ constructor is called in the NewL function and is used to
+ instantiate iTestNumber and iIniSettingsFile
+
+ @param aTestNumber - The test number that has to be executed
+ @param aIniSettingsFile - The script file that holds the sections
+ from which the value has to be retrieved
+*/
+CPDEF143929::CPDEF143929(TInt aTestNumber, CScriptFile* aIniSettingsFile) :
+ iIniSettingsFile(aIniSettingsFile),
+ iTestNumber(aTestNumber)
+ {
+ // does nothing
+ }
+
+/**
+ This function is called to initiate the tests.
+
+ @leave Leaves with a standard error.
+*/
+void CPDEF143929::DoRunL()
+ {
+ // Open the HTTP session
+ iSession.OpenL();
+ CleanupClosePushL(iSession);
+ RStringPool strP = iSession.StringPool();
+
+ TUriParser8 up;
+ up.Parse(KHttpUrl);
+ RHTTPTransaction trans1 = iSession.OpenTransactionL(up, *this, strP.StringF(HTTP::EGET,RHTTPSession::GetTable()));
+ CleanupClosePushL(trans1);
+ iTransArray.Append(trans1);
+ CleanupStack::Pop(&trans1);
+
+ for(TInt i=0; i<iTransArray.Count(); i++)
+ {
+ iTransArray[i].SubmitL();
+ iOpenTransCount++;
+ }
+
+ CActiveScheduler::Start();
+ CleanupStack::PopAndDestroy(&iSession); //close iSession
+
+ }
+
+/**
+ If a test is failed then is function is executed to log the error code
+ with which the test failed
+
+ @param aErr The error code with which the test failed.
+*/
+TInt CPDEF143929::RunError(TInt aErr)
+ {
+ iEngine->Utils().LogIt(_L("\nTest failed with error code %d\n"), aErr);
+ return KErrNone;
+ }
+
+void CPDEF143929::DoCancel()
+ {
+ }
+
+const TDesC& CPDEF143929::TestName()
+ {
+ _LIT(KHeaderTestName,"CPDEF143929");
+ return KHeaderTestName;
+ }
+
+TInt CPDEF143929::MHFRunError(TInt aError, RHTTPTransaction aTransaction, const THTTPEvent& /*aEvent*/)
+ {
+ _LIT(KLogDescription, "\nTest failed with error code %d on transaction ID=%d\n");
+ iEngine->Utils().LogIt(KLogDescription, aError, aTransaction.Id());
+ iFailureError = aError;
+ CActiveScheduler::Stop();
+ return KErrNone;
+ }
+
+void CPDEF143929::MHFRunL(RHTTPTransaction aTransaction, const THTTPEvent& aEvent)
+ {
+ switch (aEvent.iStatus)
+ {
+ case THTTPEvent::EGotResponseHeaders:
+ {
+ // HTTP response headers have been received
+ iEngine->Utils().LogIt(_L("<Got response headers>"));
+ MHTTPDataSupplier* body = aTransaction.Response().Body ();
+ if ( body )
+ {
+ body->ReleaseData ();
+ }
+ } break;
+ case THTTPEvent::ESubmit:
+ {
+ } break;
+ case THTTPEvent::EGotResponseBodyData:
+ {
+ // Some (more) body data has been received (in the HTTP response)
+ iEngine->Utils().LogIt(_L("<Got a chunk of data>"));
+ // Get the body data supplier
+ MHTTPDataSupplier* iRespBody = aTransaction.Response().Body();
+ // Append to the output file.
+ TPtrC8 bodyData;
+ TBool lastChunk = iRespBody->GetNextDataPart( bodyData );
+ iRespBody->ReleaseData();
+ } break;
+ case THTTPEvent::EResponseComplete:
+ {
+ // The transaction's response is complete
+ iEngine->Utils().LogIt(_L("<Transaction Complete>"));
+ } break;
+ case THTTPEvent::ESucceeded:
+ {
+ // The transaction succeeded
+ iEngine->Utils().LogIt(_L("<Transaction succeeded>"));
+ aTransaction.Close();
+ if(--iOpenTransCount == 0)
+ {
+ CActiveScheduler::Stop();
+ }
+ }
+ break;
+ case THTTPEvent::EFailed:
+ {
+ // The transaction failed so fail the test
+ iEngine->Utils().LogIt(_L("<Transaction failed>"));
+ aTransaction.Close();
+ if(--iOpenTransCount == 0)
+ {
+ CActiveScheduler::Stop();
+ }
+ } break;
+ default:
+ {
+ _LIT(KLogDescription, "<unrecognised event> %d");
+ iEngine->Utils().LogIt(KLogDescription,aEvent.iStatus);
+ if (aEvent.iStatus < 0)
+ {
+ iFailureError = aEvent.iStatus;
+ CActiveScheduler::Stop();
+ }
+ }
+ break;
+ }
+
+ return;
+ }
+
+
+void CPDEF143929::ConfigureSessionFiltersL(TFilterConfigurationIterator* /*aFilterConfigIter*/)
+ {
+ if (iTestNumber == 11)
+ {
+ User::Leave(KErrNone);
+ }
+
+ iCookieManager = CExampleCookieManager::NewL(iSession.StringPool());
+
+ CCookieFilterInterface::InstallFilterL(iSession, iCookieManager);
+ }
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/applayerprotocols/httptransportfw/Test/T_HttpOnline/cpdef143929.h Fri Apr 16 15:30:47 2010 +0300
@@ -0,0 +1,74 @@
+// Copyright (c) 2007-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#ifndef __T_CPDEF143929_H__
+#define __T_CPDEF143929_H__
+
+#include <http.h>
+#include <http/mhttpfiltercreationcallback.h>
+#include <http/mhttpauthenticationcallback.h>
+#include "HttpTestCore.h"
+
+// User Include
+#include "TestScripts.h"
+
+class CExampleCookieManager;
+
+/**
+ Derived test case class : test cookies
+*/
+class CPDEF143929: public CHttpTestTransBase,
+ public MHTTPTransactionCallback,
+ public MHTTPFilterCreationCallback
+
+ {
+public:
+ static CPDEF143929* NewL(TInt aTestNumber,
+ CScriptFile* aIniSettingsFile);
+ virtual ~CPDEF143929();
+ // to implement in this class' member function definitions
+public:
+ virtual void MHFRunL(RHTTPTransaction aTransaction,
+ const THTTPEvent& aEvent) ;
+ virtual TInt MHFRunError(TInt aError, RHTTPTransaction aTransaction,
+ const THTTPEvent& aEvent) ;
+
+protected:
+ CPDEF143929(TInt aTestNumber, CScriptFile* aIniSettingsFile);
+ const TDesC& TestName();
+ virtual void DoRunL();
+ virtual TInt RunError(TInt aErr);
+ virtual void DoCancel();
+ void ConfigureSessionFiltersL(TFilterConfigurationIterator* aFilterConfigIter);
+
+
+
+private:
+ /** This has the instance of the settings.ini file. This instance is passed
+ to ReplaceHostNameL() function which uses this instance to retrieve the
+ data from settings.ini file.
+ */
+ CScriptFile* iIniSettingsFile;
+
+protected:
+ TInt iOpenTransactionCount;
+ TInt iFailureError;
+ CExampleCookieManager* iCookieManager;
+ TInt iTestNumber;
+ RArray<RHTTPTransaction> iTransArray;
+ TInt iOpenTransCount;
+ };
+
+#endif // __T_CPDEF143929_H__
--- a/applayerprotocols/httptransportfw/Test/T_HttpOnline/t_httponline.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/T_HttpOnline/t_httponline.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -68,6 +68,7 @@
#include "T_SocketShutdownMode.h"
#include "cinc112633.h"
#include "cinc112633_2.h"
+#include "CPDEF143929.h"
#include "csrvaddrval.h"
#include "CINC082448.h"
@@ -155,6 +156,7 @@
_LIT(KSettingsIniName, "settings.ini");
_LIT(KRecvBufSizeTest1, "RecvBufSizeTest1");
_LIT(KRecvBufSizeTest2, "RecvBufSizeTest2");
+_LIT(KTestCPDEF143929, "PDEF143929");
const TInt KMaxHeapSize = 0x100000;
@@ -973,6 +975,24 @@
CleanupStack::Pop(index);
}
}
+
+ // CPDEF143929 test
+ if ( section->SectionName().CompareF(KTestCPDEF143929) == 0)
+ {
+ TBool runTest = iniFile->Section(i).ItemValue(KRunTestItemName(), runTestDefault);
+ if (runTest)
+ {
+ const TInt numSubTests = iniFile->ItemValue(KTestCPDEF143929(), KResNumSubTests(), 1);
+ TInt index;
+ for(index = 0; index < numSubTests; ++index)
+ {
+ CPDEF143929* incTest = CPDEF143929::NewL(index + 1, iniSettingsFile);
+ CleanupStack::PushL(incTest);
+ onlineTests.Append(incTest);
+ }
+ CleanupStack::Pop(index);
+ }
+ }
// 100-Continue tests
if ( section->SectionName().CompareF(KTest100Continue) == 0)
{
--- a/applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestServerStreamManager.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/T_HttpPipeliningTest/CTestServerStreamManager.h Fri Apr 16 15:30:47 2010 +0300
@@ -70,6 +70,7 @@
void SendDataCnfL();
void SecureClientCnf();
void OutputStreamCloseInd(TInt aError);
+ inline TBool SecureRetry(){ return EFalse;}
void MOutputStreamObserver_Reserved();
virtual void OnSendTimeOut();
virtual TInt SendTimeOutVal();
--- a/applayerprotocols/httptransportfw/Test/TestScriptTest/CTestServerStreamManager.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/TestScriptTest/CTestServerStreamManager.h Fri Apr 16 15:30:47 2010 +0300
@@ -71,6 +71,7 @@
// From MOutputStreamObserver
void SendDataCnfL();
void SecureClientCnf();
+ inline TBool SecureRetry(){ return EFalse;}
void OutputStreamCloseInd(TInt aError);
void MOutputStreamObserver_Reserved();
virtual void OnSendTimeOut();
--- a/applayerprotocols/httptransportfw/Test/t_httptransporthandler/ctestsocketwriter.h Fri Mar 19 09:39:24 2010 +0200
+++ b/applayerprotocols/httptransportfw/Test/t_httptransporthandler/ctestsocketwriter.h Fri Apr 16 15:30:47 2010 +0300
@@ -87,6 +87,8 @@
virtual void SecureClientCnf();
+ virtual TBool SecureRetry(){ return EFalse;}
+
virtual void MOutputStreamObserver_Reserved();
virtual void OnSendTimeOut();
Binary file applayerprotocols/httptransportfw/documentation/HTTP Client Internal Documentation.chm has changed
Binary file applayerprotocols/httptransportfw/documentation/HTTP Client Public API.chm has changed
--- a/applayerprotocols/wappushsupport/Group/Wap6.2 Release Notes.txt Fri Mar 19 09:39:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-WAP6.2 Release 0.8 29-Sep-2003
-==============================
-Released into:
-Built against:
-Released By: Omer Saleem
-
-Summary
-=======
-Removed all test code from WapBase. The wapbase test code is never built or run and cannot be built due to missing components and a number of build errors. This code redundant and has been removed as part of work to fix leavescan errors.
-
-
-WAP6.2 Release 0.7 22-Jan-2003
-==============================
-Released into: Typhoon Release 2107
-Built against: Typhoon 2106
-Released By: Omer Saleem
-
-Summary
-=======
-Fixed defect INC012136 - WAP Push: Framework receiving WP message assumes that content type is always well known
-
-
-WAP6.2 Release 0.6 23-Oct-2001
-==============================
-Released into: GT Mainline 536
-Built against: GT Mainline 531 (WINS and ARMI)
-Released By: David Cunado
-
-Summary
-=======
-Removed all Wap Components except those needed for WAP Push.
-The dlls from the WapPlugins Component that are needed are built as part of WapPushSupport component.
-All the Wap Code remains in the mainline, so this new component just uses uses the existing code.
-This has no new code, just a new bld.inf that uses all existing code.
-
-WAP6.2 Release 0.5 29-Aug-2001
-==============================
-Released into: GT Mainline 497
-Built against: GT Mainline 495 (WINS and ARM4)
-Released By: Omer Saleem
-
-Summary
-=======
-
-1) Fixed iby files for correct rom building
-2) Converted wap push plugins to use ECOM plugin architecture
-3) Updated Rose models
-4) Updated Waptestui to include HTTP & WSP support and canceling functionality
-
-Issues
-======
-
-1. Architecture issue + breaks BC to change.
-Wap control is giving UI access to top level plugin via API for copy and select all functionality.
-Sharing of RFs around Wap GT as its being connected to over 30 times in release code
-
-2. Trivial code cleanup stuff
-Epoc32\include folder is polluted with wap headers and perhaps go into a wap subfolder.
-A lot of redundant code and sub-components (eg wbxmltest, turl).
-
-3. Building issues
-Should wappush be in the platform_build because its not at the moment. - Answer is No its really a separate component.
-
-4. Configuration issues
-waprd is removed from gt.txt and so is not build with gt code, it has been moved to quartz - This needs to be fixed with the Quartz team for 6.2 Effectively they have grabbed some GT code.
-
-5. Known Defects
-Defect with wapstack is failing wap mainline build smoke tests - Being looked @ by Chris Trick, and should have been resolved by EOW 35
-
-6. Hardware testing
-Minimal hardware testing has been carried out on assabet. Problems that exist was that it would not connect using NT Ras and rendered decks had to be forced to redraw by pressing an arrow key to display the deck.
-
-
-
-WAP6.2 Release 0.4 08-Aug-2001
-==============================
-Released into: GT Mainline 483
-Built against: GT Mainline 481 (WINS and ARMI)
-Released By: Omer Saleem
-
-Summary
-=======
-
-1) Fixed all Wap test harnesses
-2) Added missing distribution.policy files
-3) Implemented ECOM plugin architure and removed the old one
-4) Converted all plugins to new ECOM plugins
-5) Fixed rendering defects SAM-4Z7HMU, UDN-4YXHHZ, UDN-4YXDPT, SAM-4YGD4M.
-6) Changed MMP's to reduce warnings
-
-
-WAP6.2 Release 0.3 13-Jul-2001 (Part III)
-========================================
-Released into: GT Mainline 465
-Built against: GT Mainline 462 (WINS and ARMI)
-Released By: David Cunado
-
-Summary
-=======
-
-1. Adding missing export
-
-WAP6.2 Release 0.3 13-Jul-2001 (Part II)
-========================================
-Released into: GT Mainline 465
-Built against: GT Mainline 462 (WINS and ARMI)
-Released By: David Cunado
-
-Summary
-=======
-
-1.Adding WapTestUi App.
-
-WAP6.2 Release 0.3 13-Jul-2001 (Part I)
-=======================================
-Released into: GT Mainline 465
-Built against: GT Mainline 462 (WINS and ARMI)
-Released By: David Cunado
-
-Summary
-=======
-
-1. Added CommDb 2-box solutions changes.
-2. Removed WapUtils component from build list for development platform_build.
-3. Changed TWmlLibMachine and TWapLCtx to use the changed Wap Local context Dll name - now is WapLCtx.lib. Also had other updates. Note - TWmlLibMachine syil has linkage problems (but is test code - fix on next release).
-4. Changed MMP files through-out to use INetProtUtil.lib instead of WapUtils.lib.
-5. Fixed TEng to build and run - fixed memory leak and bulid problems due to MDialogProvider API changes,
-6. Fix for wap rendering for the hotspot mis-alignment - not yet complete.
-7. Added unknown content handler - included changes to wmlscriptdatahandler to replace CDefaultDataHandler with CUnknownContentDataHandler.
-8. Added distribution policy files wtai
-
-
-WAP6.2 Release 0.2 13-Jun-2001
-==============================
-Released into: GT Mainline 443
-Built against: GT Mainline 441 (ARMI)
-Released By: David Cunado
-Changelist: ???????
-
-Summary
-=======
-Changes to WapEngine.iby to include uaprof and wtai dlls.
-
-WAP6.2 Release 0.2 11-Jun-2001
-==============================
-Released into: GT Mainline 441
-Built against: GT Mainline 435 (WINS and ARMI)
-Released By: David Cunado
-Changelist: ???????
-
-Summary
-=======
-Changes to TEng test code to implement new functions in MDialogProvider class.
-
-WAP6.2 Release 0.1 04-Jun-2001
-===================================
-Released into: GT Mainline 437
-Built against: GT Mainline 435 (WINS and ARMI)
-Released By: Omer Saleem
-Uses: EUSER EFSRV ETEL CNTMODEL GSMAVD COMMDB BAFL
-Changelist: ??????
-
-Summary
-=======
-
-This release contains two new components for the WAP Browser 6.2, these are for WTAI Public and UAProfs, each is detailed below:
-
-1) This is the first iteration release for the WTAI Public component of the GT 0101 Wap Browser 6.2 project. This release for WTAI Public involves four main changes:
-* wtaipublic.dll contains the core functionality required by WTAI
-* wtaiplugin.dll provided the URI scheme handler for the wtai scheme
-* changes to the WMLScript engine to incorporate the WTAI scripting commands
-* changes to the MWapControlObserver (MDialogProvider) interface to provide the new required dialog for WTAI
-
-2) This is the first iteration release for the UAProf component of the GT 0101 Wap Browser 6.2 project. This release provides the following deliverables:
-* uaprof.dll This provides all the functionality required for UAProf using profiles and profile-diffs supplied in the form of files in a specific directory
-* Changes made to the HTTP plugin to use the UAProf functionality to sent the header data requires and parse any returned UAProf data
-
-Use Cases Delivered
-===================
-
-WTAI Public:
-------------
-All the use cases outlined in the document "GT0101 UCM.03 WTAI 6.2 Customer Use Case Analysis.doc" have been delivered in this release. This includes:
-* Making a voice call using a URI
-* Making a voice call using WMLScript
-* Sending DTMF tones using a URI
-* Sending DTMF tones using WMLScript
-* Adding a phonebook entry using a URI
-* Adding a phonebook entry using WMLScript
-* Providing a method to cancel dialing a voice call
-* Providing a method to cancel sending DTMF tones
-
-UAProfs:
---------
-All the use cases detailed in the document "GT0101 UCM.04 UAProf 6.2 Customer Use Case Analysis.doc" have been implemented in this release with the exception of the use cases related to the RDF Compiler which is fulfilled in the RDF Compiler component. The use cases include:
-* Establish UAProf-aware WSP Session
-* Request Content Generate for Device CPI Cached at WAP Gateway
-* Form Device CPI
-* Add a Profile to the Device CPI
-* Remove a Profile from the Device CPI
-* Add a User-Preference to the Device CPI
-* Remove a User-Preference from the Device CPI
-
-More Information
-================
-
-The changes made in this release change the MWapControlObserver interface which is implemented by the WAP UI, therefore the changes made will break the UI. To allow the UI to compile, the WAP UI will also be modified with stub functions to allow it to compile and will later be implemented by the WAP UI team.
-
-This release of the UAProf component contains the implementation supporting UAProf including dynamic profile data building. However for this release HTTP will not be using the dynamic profiles and profiles will only be required for the establishment of the session only.
-
-Known Issues
-============
-
-WTAI Public:
-------------
-* When WTAI makes a call, any current active calls (data or voice) are put on hold and the new voice call is made. We need to know how this should be handled, whether we will be using GPRS with an always on feel, or whether we should hang up a data call if one exists.
-* When WTAI makes a call, does the phone app pick up the new call or do we need to inform it of the new call
-* When returning the result of a WTAI function invoked from a URI, does the variable name after the '!' have to be var_name or $var_name
-
-UAProfs:
---------
-* The current implementation provides dynamic profiles by changing the number of CPI files in the profile depot directory. This means that profiles can only be changed by adding and removing files, not by modifying existing ones.
\ No newline at end of file
--- a/brdo.layers.sysdef.xml Fri Mar 19 09:39:24 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd"
- [ <!ENTITY layer_real_source_path "sf/mw/netprotocols" > ]>
-
-<SystemDefinition name="netprotocols" schema="1.4.0">
- <systemModel>
- <layer name="mw_layer">
- <module name="netprotocols_plat">
- <unit unitID="cookie_manager_api" name="cookie_manager_api" bldFile="&layer_real_source_path;/netprotocols_plat/cookie_manager_api/group" mrp=""/>
- <unit unitID="http_cache_mgr_api" name="http_cache_mgr_api" bldFile="&layer_real_source_path;/netprotocols_plat/http_cache_mgr_api/group" mrp=""/>
- <unit unitID="http_filters_api" name="http_filters_api" bldFile="&layer_real_source_path;/netprotocols_plat/http_filters_api/group" mrp=""/>
- </module>
- <module name="httpfilters">
- <unit unitID="cookie" name="cookie" bldFile="&layer_real_source_path;/httpfilters/cookie/group" mrp=""/>
- <unit unitID="deflatefilter" name="deflatefilter" bldFile="&layer_real_source_path;/httpfilters/deflatefilter/group" mrp=""/>
- <unit unitID="httpfilteracceptheader" name="httpfilteracceptheader" bldFile="&layer_real_source_path;/httpfilters/httpfilteracceptheader/group" mrp=""/>
- <unit unitID="httpfilterauthentication" name="httpfilterauthentication" bldFile="&layer_real_source_path;/httpfilters/httpfilterauthentication/group" mrp=""/>
- <unit unitID="httpfiltercommon" name="httpfiltercommon" bldFile="&layer_real_source_path;/httpfilters/httpfiltercommon/group" mrp=""/>
- <unit unitID="httpfilterconnhandler" name="httpfilterconnhandler" bldFile="&layer_real_source_path;/httpfilters/httpfilterconnhandler/group" mrp=""/>
- <unit unitID="httpfilteriop" name="httpfilteriop" bldFile="&layer_real_source_path;/httpfilters/httpfilteriop/group" mrp=""/>
- <unit unitID="httpfilterproxy" name="httpfilterproxy" bldFile="&layer_real_source_path;/httpfilters/httpfilterproxy/group" mrp=""/>
- <unit unitID="uaproffilter" name="uaproffilter" bldFile="&layer_real_source_path;/httpfilters/uaproffilter/group" mrp=""/>
- </module>
- </layer>
- </systemModel>
-</SystemDefinition>
--- a/httpfilters/cookie/FilterSrc/101F852E.rss Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/FilterSrc/101F852E.rss Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/FilterSrc/CookieFilterMain.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/Group/CookieFilter.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/Group/CookieManager.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/Group/bld.inf Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/Cookie.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieArray.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerClient.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerServer.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/cookie/ManagerSrc/CookieManagerSession.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/group/DeflateFilter.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/inc/DecmpStream.h Fri Apr 16 15:30:47 2010 +0300
@@ -20,7 +20,7 @@
#define __DECMPSTREAM_H_
//------------------------------------------------------------------------------
-#include <EZGzip.h>
+#include <ezgzip.h>
//------------------------------------------------------------------------------
class EZDecompressor;
--- a/httpfilters/deflatefilter/inc/StreamBufMgr.h Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/inc/StreamBufMgr.h Fri Apr 16 15:30:47 2010 +0300
@@ -21,7 +21,7 @@
//------------------------------------------------------------------------------
#include <e32base.h>
-#include <EZBufMan.h>
+#include <ezbufman.h>
//------------------------------------------------------------------------------
class CGzipStream;
--- a/httpfilters/deflatefilter/src/101F9712.rss Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/src/101F9712.rss Fri Apr 16 15:30:47 2010 +0300
@@ -21,7 +21,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/deflatefilter/src/DecmpStream.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/src/DecmpStream.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/src/DeflateFilter.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/deflatefilter/src/StreamBufMgr.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -17,7 +17,7 @@
*
*/
-#include <EZStream.h>
+#include <ezstream.h>
#include "StreamBufMgr.h"
//-----------------------------------------------------------------------------
--- a/httpfilters/group/bld.inf Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/group/bld.inf Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/Data/101F8566.rss Fri Apr 16 15:30:47 2010 +0300
@@ -17,7 +17,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilteracceptheader/Src/HttpFilterAcceptHeader.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/Src/HttpFilterAcceptHeader.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -22,14 +22,14 @@
#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>
--- a/httpfilters/httpfilteracceptheader/group/HttpFilterAcceptHeader.mmp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteracceptheader/group/HttpFilterAcceptHeader.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterauthentication/Data/101F8493.rss Fri Apr 16 15:30:47 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterauthentication/Src/HttpFilterAuthentication.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterauthentication/Src/HttpFilterAuthentication.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterauthentication/group/HttpFilterAuthentication.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfiltercommon/group/HttpFilterCommon.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Data/101F8585.rss Fri Apr 16 15:30:47 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterconnhandler/Src/HttpFilterConnHandler.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Src/HttpFilterConnHandler.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/Src/httpfilterconnhandlerObserverPS.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/group/bld.inf Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterconnhandler/group/httpfilterConnHandler.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -26,7 +26,7 @@
CAPABILITY CAP_ECOM_PLUGIN
USERINCLUDE ../Inc
-USERINCLUDE ../../HttpFilterCommon/inc
+USERINCLUDE ../../httpfiltercommon/inc
MW_LAYER_SYSTEMINCLUDE
@@ -35,12 +35,12 @@
SOURCE httpFilterConnHandler.cpp
SOURCE HttpFilterConnHandlerMain.cpp
-SOURCE httpFilterConnHandlerObserverPS.cpp
+SOURCE httpfilterconnhandlerObserverPS.cpp
SOURCEPATH ../Data
START RESOURCE 101F8585.rss
-TARGET httpfilterconnhandler.rsc
+TARGET HttpFilterConnHandler.rsc
END
LIBRARY HttpFilterCommon.lib http.lib euser.lib bafl.lib ecom.lib inetprotutil.lib
--- a/httpfilters/httpfilteriop/Data/101F8592.rss Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteriop/Data/101F8592.rss Fri Apr 16 15:30:47 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilteriop/Src/HttpFilterIop.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteriop/Src/HttpFilterIop.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteriop/group/bld.inf Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilteriop/group/httpfilterIop.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterproxy/Data/101FD666.rss Fri Apr 16 15:30:47 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
--- a/httpfilters/httpfilterproxy/Src/HttpFilterProxy.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterproxy/Src/HttpFilterProxy.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterproxy/group/bld.inf Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/httpfilterproxy/group/httpfilterproxy.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/uaproffilter/group/uaproffilter.mmp Fri Apr 16 15:30:47 2010 +0300
@@ -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 19 09:39:24 2010 +0200
+++ b/httpfilters/uaproffilter/src/101f8539.rss Fri Apr 16 15:30:47 2010 +0300
@@ -18,7 +18,7 @@
// INCLUDES
-#include <ecom/RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
// RESOURCE DEFINITIONS
// -----------------------------------------------------------------------------
--- a/httpfilters/uaproffilter/src/uaproffilter.cpp Fri Mar 19 09:39:24 2010 +0200
+++ b/httpfilters/uaproffilter/src/uaproffilter.cpp Fri Apr 16 15:30:47 2010 +0300
@@ -31,9 +31,9 @@
#include <httperr.h>
#include <BrowserUiSDKCRKeys.h>
-#include <webutilsinternalcrkeys.h>//for the profile strings
+#include <WebUtilsInternalCRKeys.h>//for the profile strings
-#include <cuseragent.h>
+#include <CUserAgent.h>
#include <featmgr.h>
#include <bldvariant.hrh>
--- a/layers.sysdef.xml Fri Mar 19 09:39:24 2010 +0200
+++ b/layers.sysdef.xml Fri Apr 16 15:30:47 2010 +0300
@@ -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>