| author | Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> | 
| Thu, 19 Aug 2010 10:27:19 +0300 | |
| branch | RCL_3 | 
| changeset 18 | 5f1cd966e0d9 | 
| parent 7 | 2611c08ee28e | 
| child 19 | c0c2f28ace9c | 
| permissions | -rw-r--r-- | 
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1 | // Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). | 
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 2 | // All rights reserved. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 3 | // This component and the accompanying materials are made available | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 4 | // under the terms of "Eclipse Public License v1.0" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 5 | // which accompanies this distribution, and is available | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 6 | // at the URL "http://www.eclipse.org/legal/epl-v10.html". | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 7 | // | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 8 | // Initial Contributors: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 9 | // Nokia Corporation - initial contribution. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 10 | // | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 11 | // Contributors: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 12 | // | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 13 | // Description: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 14 | // | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 15 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 16 | #include "chttpclienthandler.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 17 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 18 | #include <http.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 19 | #include <http/framework/crxdata.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 20 | #include <http/framework/csecuritypolicy.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 21 | #include <inetprottextutils.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 22 | #include <uriutilscommon.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 23 | #include <uriutils.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 24 | #include <authority8.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 25 | #include <in_sock.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 26 | #include <securesocket.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 27 | #include <x509certext.h> | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 28 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 29 | #include "chttptransportlayer.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 30 | #include "chttpclientfilter.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 31 | #include "chttpconnectfilter.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 32 | #include "chttpclientheadercodec.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 33 | #include "chttpclienttransaction.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 34 | #include "chttpconnectioninfo.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 35 | #include "chttpconnectionmanager.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 36 | #include "chttprequestcomposer.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 37 | #include "chttpresponseparser.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 38 | #include "thttpclientpanic.h" | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 39 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 40 | const TInt KHttpDefaultPort = 80; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 41 | const TInt KHttpDefaultSecurePort = 443; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 42 | const TInt KHttpDefaultProxyPort = 8080; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 43 | const TInt KMaxConnectionManagers = 4; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 44 | const TInt KDefaultBatchingBufSize = 1400; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 45 | const TInt KDefaultMaxNumberTransactionsToPipeline = KMaxTInt; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 46 | const TInt KDefaultBufferSize = 32*1024; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 47 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 48 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 49 | _LIT8(KSecureHttpScheme, "https"); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 50 | _LIT8(KHttpClientCodecName, "HTTP/client"); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 51 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 52 | _LIT8(KUAProfile, "x-wap-profile"); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 53 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 54 | const TUint KIPv6HostOpenBrace = '['; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 55 | const TUint KIPv6HostCloseBrace = ']'; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 56 | class InetProtTextUtils; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 57 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 58 | CHttpClientHandler* CHttpClientHandler::NewL(TAny* aSession) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 59 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 60 | RHTTPSession* httpSession = REINTERPRET_CAST(RHTTPSession*, aSession); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 61 | CHttpClientHandler* self = new (ELeave) CHttpClientHandler(*httpSession); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 62 | CleanupStack::PushL(self); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 63 | self->ConstructL(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 64 | CleanupStack::Pop(self); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 65 | return self; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 66 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 67 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 68 | CHttpClientHandler::~CHttpClientHandler() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 69 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 70 | iProxyAddress.Close(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 71 | iConnectionManagers.ResetAndDestroy(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 72 | delete iTransportLayer; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 73 | delete iPipelineFallback; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 74 | __FLOG_CLOSE; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 75 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 76 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 77 | CHttpClientHandler::CHttpClientHandler(RHTTPSession aSession) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 78 | : CProtocolHandler(aSession), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 79 | iStringTable(RHTTPSession::GetTable()) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 80 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 81 | 	__FLOG_OPEN("http", "httpclienthandler.txt");
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 82 | 	__FLOG(_T8("HTTP Client Protocol Handler Log"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 83 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 84 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 85 | void CHttpClientHandler::ConstructL() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 86 | 	{	
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 87 | CProtocolHandler::ConstructL(iSession); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 88 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 89 | CHttpClientFilter* clientFilter = CHttpClientFilter::NewL(iSession); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 90 | CleanupStack::PushL ( clientFilter ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 91 | CHttpConnectFilter::NewL(iSession); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 92 | CleanupStack::Pop (); // clientFilter | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 93 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 94 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 95 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 96 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 97 | TBool hasValue = connInfo.Property(stringPool.StringF(HTTP::ESessionClosing, iStringTable), value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 98 | if( hasValue && value.Type() == THTTPHdrVal::KTIntVal ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 99 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 100 | iSessionClosingPtr = reinterpret_cast<TBool*>(value.Int()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 101 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 102 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 103 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 104 | 		__FLOG_0(_T8("!! Session Closing Flag NOT set"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 105 | User::Leave(KErrNotFound); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 106 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 107 | iPipelineFallback = CHttpPipelineFallback::NewL(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 108 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 109 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 110 | CHttpConnectionInfo* CHttpClientHandler::PrepareTransactionL(RHTTPTransaction aTrans, TBool& aNeedTunnel, TBool& aCanPipeline) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 111 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 112 | // Check that filters are not added headers that are not needed for CONNECT method. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 113 | // Remove the unwanted headers. But do only if the property has been set for the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 114 | // strict CONNECT method. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 115 | EnsureStrictConnectMethodHeaders (aTrans); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 116 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 117 | // To prepare the transaction need to create the Request-URI, set the Host | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 118 | // header and establish the connection info. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 119 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 120 | RHTTPRequest request = aTrans.Request(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 121 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 122 | SetupProxyInformation(aTrans); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 123 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 124 | // Store the method index from string table | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 125 | TInt methodIndex = request.Method().Index(iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 126 | // Check for https scheme. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 127 | const TUriC8& uri = request.URI(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 128 | // secure doesn't count if it's a connect request | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 129 | TBool secure = methodIndex != HTTP::ECONNECT && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 130 | (uri.Extract(EUriScheme).CompareF(KSecureHttpScheme) == 0); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 131 | // Create the Request-URI for this transaction... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 132 | TInt port = (secure) ? KHttpDefaultSecurePort : KHttpDefaultPort; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 133 | TPtrC8 host; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 134 | CreateRequestUriL(methodIndex, aTrans, host, port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 135 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 136 | // If the host name is empty leave as the URI is not complete - a CONNECT | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 137 | // method request has an empty host as it will go to the proxy. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 138 | if( host.Length() == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 139 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 140 | 		__FLOG_0(_T8("!! Invalid uri"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 141 | 		__FLOG_2(_T8("-> Trans %d, Con %d : missing host!"), aTrans.Id(),GetConnectionID(aTrans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 142 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 143 | User::Leave(KErrHttpInvalidUri); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 144 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 145 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 146 | // Set the Host header... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 147 | TBool isHttp10 = SetHostHeaderL(aTrans, host, port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 148 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 149 | // Create the connection info. Is a proxy being used? | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 150 | if( iUseProxy ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 151 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 152 | // Need a tunnel if request is going via a proxy and request is using | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 153 | // the https scheme | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 154 | if( secure ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 155 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 156 | 			__FLOG_4(_T8("Trans %d, Con %d : tunnel required to host %S, port %d"), aTrans.Id(),GetConnectionID(aTrans), &host, port);
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 157 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 158 | // This request needs a tunnel to be established to the specified | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 159 | // host/port - add the ETunnel property to the transaction. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 160 | aNeedTunnel = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 161 | AddTunnelInfoL(aTrans, host, port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 162 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 163 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 164 | // Need to obtain the proxy info. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 165 | const TDesC8& proxy = iProxyAddress.DesC(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 166 | TAuthorityParser8 auth; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 167 | auth.Parse(proxy); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 168 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 169 | host.Set(auth.Extract(EAuthorityHost)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 170 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 171 | // Read the proxy port if present | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 172 | port = KHttpDefaultProxyPort; // Initialise with default proxy port | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 173 | if( auth.IsPresent(EAuthorityPort) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 174 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 175 | TPtrC8 portDesc = auth.Extract(EAuthorityPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 176 | TInt error = InetProtTextUtils::ConvertDescriptorToInt(portDesc, port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 177 | if( error != KUriUtilsErrEmptyData ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 178 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 179 | // An empty port component is allowed - just ignore it. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 180 | User::LeaveIfError(error); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 181 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 182 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 183 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 184 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 185 | // Is a non-persistent connection required? The connection is non-persistent | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 186 | // if either it is a HTTP/1.0 request or it is a HTTP/1.1 request and it has | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 187 | // a Connection: close header. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 188 | RHTTPHeaders headers = request.GetHeaderCollection(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 189 | CHttpConnectionInfo::THttpPersistent persistentState = isHttp10 ? | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 190 | CHttpConnectionInfo::ENonPersistent : | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 191 | CHttpConnectionInfo::EPersistent; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 192 | THTTPHdrVal connVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 193 | RStringF connStr = stringPool.StringF(HTTP::EConnection, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 194 | if( headers.GetField(connStr,0,connVal) == KErrNone ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 195 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 196 | __ASSERT_DEBUG( !isHttp10, THttpClientPanic::Panic(THttpClientPanic::EInvalidHeaderForHTTP10) ); // no connection headers are allowed in HTTP/1.0 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 197 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 198 | if( (connVal.Type() == THTTPHdrVal::KStrFVal) && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 199 | (connVal.StrF() == stringPool.StringF(HTTP::EClose, iStringTable)) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 200 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 201 | // Client has specified a Connection: close header - non-persistent | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 202 | // connection. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 203 | persistentState = CHttpConnectionInfo::ENonPersistent; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 204 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 205 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 206 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 207 | // Create the connection info object | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 208 | CHttpConnectionInfo* connectionInfo = CHttpConnectionInfo::NewL(stringPool, host, static_cast<TUint16>(port)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 209 | connectionInfo->SetSecureState(secure); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 210 | connectionInfo->SetPersistentState(persistentState); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 211 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 212 | // Check to see if this transaction can be pipelined. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 213 | switch(methodIndex) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 214 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 215 | case HTTP::EGET: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 216 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 217 | // Can only pipeline non-HTTP/1.0 requests... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 218 | if( !isHttp10 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 219 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 220 | // These methods can be pipelined but only if pipelining has not been | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 221 | // specifically disabled for the transaction. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 222 | aCanPipeline = (CheckPipelineSupport(aTrans) && !iPipelineFallback->NeedPipelineFallback(host)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 223 |             __FLOG_4(_T8("Pipelining --- enabled: %d Support: %d Fallback: %d  Host %S"), aCanPipeline, CheckPipelineSupport(aTrans), !iPipelineFallback->NeedPipelineFallback(host), &host);
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 224 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 225 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 226 | // Allow the HTTP/1.0 requests to drop through to default case. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 227 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 228 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 229 | // All other methods are not to be pipelined. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 230 | aCanPipeline = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 231 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 232 | }; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 233 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 234 | return connectionInfo; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 235 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 236 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 237 | void CHttpClientHandler::CreateRequestUriL(TInt aMethodIndex, RHTTPTransaction aTrans, TPtrC8& aHost, TInt& aPort) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 238 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 239 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 240 | RHTTPRequest request = aTrans.Request(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 241 | const TUriC8& uri = request.URI(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 242 | TBool secure = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 243 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 244 | RStringF scheme = stringPool.OpenFStringL(uri.Extract(EUriScheme)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 245 | CleanupClosePushL(scheme); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 246 | if( aMethodIndex == HTTP::ECONNECT ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 247 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 248 | __ASSERT_DEBUG( iUseProxy, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 249 | aHost.Set(uri.Extract(EUriHost)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 250 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 251 | else if( uri.IsPresent(EUriHost) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 252 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 253 | // The request URI is absolute - check the scheme is http or https | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 254 | secure = uri.IsPresent(EUriScheme) && (scheme.Index(iStringTable) == HTTP::EHTTPS); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 255 | if( !uri.IsPresent(EUriScheme) || !secure && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 256 | scheme.Index(iStringTable) != HTTP::EHTTP) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 257 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 258 | 			__FLOG_0(_T8("!! Invalid uri."));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 259 | 			__FLOG_3(_T8("-> Trans %d, Con %d: %S scheme is not supported!"), aTrans.Id(),GetConnectionID(aTrans), &scheme.DesC());
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 260 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 261 | User::Leave(KErrHttpInvalidUri); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 262 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 263 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 264 | // Get the host and port info from it. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 265 | aHost.Set(uri.Extract(EUriHost)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 266 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 267 | // Check to see if a port has been specified | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 268 | if( uri.IsPresent(EUriPort) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 269 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 270 | TPtrC8 port = uri.Extract(EUriPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 271 | TInt error = InetProtTextUtils::ConvertDescriptorToInt(port, aPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 272 | if( error != KUriUtilsErrEmptyData ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 273 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 274 | // An empty port component is allowed - just ignore it. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 275 | User::LeaveIfError(error); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 276 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 277 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 278 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 279 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 280 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 281 | // The request URI is relative - update the request URI to be absolute. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 282 | // The client MUST have supplied a Host header. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 283 | RHTTPHeaders headers = request.GetHeaderCollection(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 284 | RStringF hostStr = stringPool.StringF(HTTP::EHost, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 285 | THTTPHdrVal hostVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 286 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 287 | if( headers.GetField(hostStr, 0, hostVal) == KErrNotFound ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 288 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 289 | // No Host header - do not know which host to connect to. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 290 | User::Leave(KErrHttpGeneralHeaderMissingHost); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 291 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 292 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 293 | __ASSERT_DEBUG( hostVal.Type() == THTTPHdrVal::KStrFVal, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 294 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 295 | // Set the host output argument | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 296 | aHost.Set(hostVal.StrF().DesC()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 297 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 298 | // Create the absolute uri | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 299 | CUri8* absoluteUri = CUri8::NewLC(uri); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 300 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 301 | RStringF httpStr = stringPool.StringF(HTTP::EHTTP, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 302 | absoluteUri->SetComponentL(httpStr.DesC(), EUriScheme); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 303 | absoluteUri->SetComponentL(aHost, EUriHost); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 304 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 305 | // Check for port info in the Host header | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 306 | RStringF portStr = stringPool.StringF(HTTP::EPort, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 307 | THTTPHdrVal portVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 308 | TBool hasPort = (headers.GetParam(hostStr, portStr, portVal) == KErrNone); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 309 | if( hasPort && portVal.Type() == THTTPHdrVal::KTIntVal ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 310 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 311 | // Set the port output argument | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 312 | aPort = portVal.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 313 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 314 | // Convert the int value to its descriptor format | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 315 | HBufC8* portBuf = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 316 | InetProtTextUtils::ConvertIntToDescriptorL(aPort, portBuf); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 317 | CleanupStack::PushL(portBuf); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 318 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 319 | absoluteUri->SetComponentL(*portBuf, EUriPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 320 | CleanupStack::PopAndDestroy(portBuf); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 321 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 322 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 323 | // Now set the absolute URI back into the transaction | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 324 | request.SetURIL(absoluteUri->Uri()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 325 | CleanupStack::PopAndDestroy(absoluteUri); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 326 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 327 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 328 | // Create the Request-URI based on the request URI. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 329 | // NOTE - might have changed from earlier | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 330 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 331 | const TUriC8 reqURI = request.URI(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 332 | // CONNECT uses authority while everything else uses absoluteURI or absolutePath | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 333 | // use absolutePath for direct connections and tunnels, and absoluteURI for proxy | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 334 | // note: OPTIONS uses "*" as well, but that should still work | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 335 | CAuthority8* authToUse=NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 336 | CUri8* uriToUse = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 337 | if( aMethodIndex == HTTP::ECONNECT) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 338 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 339 | authToUse = CAuthority8::NewLC(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 340 | authToUse->SetComponentL(reqURI.Extract(EUriUserinfo),EAuthorityUserinfo); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 341 | authToUse->SetComponentL(reqURI.Extract(EUriHost),EAuthorityHost); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 342 | authToUse->SetComponentL(reqURI.Extract(EUriPort),EAuthorityPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 343 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 344 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 345 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 346 | uriToUse = CUri8::NewLC(reqURI); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 347 | if( !iUseProxy || secure ) // if (useproxy and not secure) or (not useproxy) = not useproxy or secure | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 348 | 			{// Not going via a proxy - need to remove the scheme and authority parts
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 349 | uriToUse->RemoveComponentL(EUriScheme); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 350 | uriToUse->RemoveComponentL(EUriHost); // this also removes the userinfo + port | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 351 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 352 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 353 | // Set the Request-URI for the request | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 354 | RString uriStr = stringPool.OpenStringL( | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 355 | authToUse ? authToUse->Authority().AuthorityDes() : uriToUse->Uri().UriDes()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 356 | CleanupClosePushL(uriStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 357 | THTTPHdrVal uriVal(uriStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 358 | aTrans.PropertySet().SetPropertyL(stringPool.StringF(HTTP::EUri, iStringTable), uriVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 359 | CleanupStack::PopAndDestroy(3, &scheme); // uriToUse or authToUse, uriStr | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 360 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 361 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 362 | TBool CHttpClientHandler::SetHostHeaderL(RHTTPTransaction aTrans, const TDesC8& aHost, TInt aPort) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 363 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 364 | __START_PERFORMANCE_LOGGER(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 365 | // Set the Host header only if the request is not an HTTP/1.0 request. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 366 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 367 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 368 | THTTPHdrVal httpVersion; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 369 | TBool isHttp10 = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 370 | if( connInfo.Property(stringPool.StringF(HTTP::EHTTPVersion,iStringTable), httpVersion) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 371 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 372 | __ASSERT_DEBUG( httpVersion.Type() == THTTPHdrVal::KStrFVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidHeaderValueType) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 373 | isHttp10 = (httpVersion.StrF() == stringPool.StringF(HTTP::EHttp10, iStringTable)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 374 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 375 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 376 | // Regardless of proxy settings a Host header based on the URI authority must be added unless | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 377 | // this is an HTTP/1.0 request in which case a Host header should not exist. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 378 | RHTTPRequest request = aTrans.Request(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 379 | RHTTPHeaders headers = request.GetHeaderCollection(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 380 | RStringF hostStr = stringPool.StringF(HTTP::EHost, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 381 | if( !isHttp10 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 382 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 383 | // If the Host header does not already exist, add it! | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 384 | THTTPHdrVal hostValue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 385 | if( headers.GetField(hostStr, 0, hostValue) == KErrNotFound ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 386 | 			{				
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 387 | // Set the Host header... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 388 | RStringF hostValStr; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 389 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 390 | // Check if its a literal IPV6 address | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 391 | UriUtils::TUriHostType aHostsType = UriUtils::HostType( aHost ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 392 | if ( ( aHostsType != UriUtils::ETextHost ) && ( aHostsType != UriUtils::EIPv4Host ) ) // is an IPv6 or other future protocol address | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 393 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 394 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 395 | HBufC8* ipv6LiteralHost = HBufC8::NewLC( aHost.Length() + 2 ); // add 2 for the braces | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 396 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 397 | TPtr8 ipv6LiteralHostPtr = ipv6LiteralHost->Des(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 398 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 399 | ipv6LiteralHostPtr.Append( KIPv6HostOpenBrace ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 400 | ipv6LiteralHostPtr.Append( aHost ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 401 | ipv6LiteralHostPtr.Append( KIPv6HostCloseBrace ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 402 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 403 | hostValStr = stringPool.OpenFStringL( ipv6LiteralHostPtr ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 404 | CleanupStack::PopAndDestroy( ipv6LiteralHost ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 405 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 406 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 407 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 408 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 409 | hostValStr = stringPool.OpenFStringL( aHost ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 410 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 411 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 412 | CleanupClosePushL(hostValStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 413 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 414 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 415 | THTTPHdrVal hostVal(hostValStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 416 | headers.SetFieldL(hostStr, hostVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 417 | CleanupStack::PopAndDestroy(&hostValStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 418 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 419 | // Also set the port number if Host header is not empty and a port | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 420 | // number is not the default. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 421 | if( aPort != KHttpDefaultPort && aPort != KHttpDefaultSecurePort ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 422 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 423 | THTTPHdrVal portVal(aPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 424 | RStringF portStr = stringPool.StringF(HTTP::EPort,iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 425 | headers.SetParamL(hostStr, portStr, portVal, 0); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 426 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 427 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 428 | // else the Host header already exists, so do nothing | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 429 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 430 | else // This is an HTTP/1.0 request | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 431 | headers.RemoveField(hostStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 432 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 433 | 	__END_PERFORMANCE_LOGGER(_L(",CHttpClientHandler::SetHostHeaderL()"));	
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 434 | return isHttp10; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 435 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 436 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 437 | void CHttpClientHandler::AddTunnelInfoL(RHTTPTransaction aTrans, const TDesC8& aHost, TInt aPort) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 438 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 439 | // Convert the port number into a descriptor... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 440 | HBufC8* port = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 441 | InetProtTextUtils::ConvertIntToDescriptorL(aPort, port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 442 | CleanupStack::PushL(port); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 443 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 444 | // Create the Request-URI for the CONNECT request - it is in the 'authority' | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 445 | // form, as described in RFC2616, section 5.1.2. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 446 | CAuthority8* authority = CAuthority8::NewLC(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 447 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 448 | authority->SetComponentL(aHost, EAuthorityHost); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 449 | authority->SetComponentL(*port, EAuthorityPort); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 450 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 451 | // Set this as the ETunnel property in the transaction. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 452 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 453 | RStringF tunnelStr = stringPool.OpenFStringL(authority->Authority().AuthorityDes()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 454 | CleanupClosePushL(tunnelStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 455 | THTTPHdrVal tunnelVal(tunnelStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 456 | aTrans.PropertySet().SetPropertyL(stringPool.StringF(HTTP::ETunnel, iStringTable), tunnelVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 457 | CleanupStack::PopAndDestroy(3, port); // delete authority and close tunnelStr | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 458 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 459 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 460 | TBool CHttpClientHandler::SelectConnectionManagerL(const CHttpConnectionInfo& aConnectionInfo, RHTTPTransaction aTrans, TBool aCanPipeline, CHttpConnectionManager *&aManager ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 461 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 462 | // Selecting a connection manager depends on whether the transaction can be | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 463 | // pipelined. If so, then the connection manager of choice would be the one | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 464 | // that is connected to the correct location and busy with other transactions. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 465 | // If there is no connection manager that fits this criteria, then the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 466 | // selection process follows that for a transaction that cannot be pipelined. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 467 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 468 | // The order of preference for selecting a connection manager - | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 469 | // 1) A manager that is connected to the correct location and is available. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 470 | // This is the backup-choice for a transaction that can be pipelined. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 471 | // 2) A manager that is not connected to anywhere. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 472 | // 3) Create a new manager if the limit has not been reached. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 473 | // 4) Use a manager that is connected to a different host (but not being | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 474 | // used) and will therefore need disconnecting and reconnecting. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 475 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 476 | CHttpConnectionManager* backupChoice = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 477 | CHttpConnectionManager* secondChoice = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 478 | CHttpConnectionManager* fourthChoice = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 479 | CHttpConnectionManager* managerConnecting = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 480 | TBool newConnection = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 481 | TInt numConnectionsToSingleServer = 0; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 482 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 483 | TBool connectMethod = aTrans.Request().Method().Index(iStringTable) == HTTP::ECONNECT; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 484 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 485 | const TInt numConnMan = iConnectionManagers.Count(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 486 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 487 | for( TInt ii=0; (ii < numConnMan && aManager == NULL ); ++ii ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 488 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 489 | CHttpConnectionManager::TConnectionStatus status = iConnectionManagers[ii]->Status(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 490 | switch( status ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 491 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 492 | case CHttpConnectionManager::ENotConnected: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 493 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 494 | // This is a pretty good option because it just needs a connection | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 495 | // to be established | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 496 | secondChoice = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 497 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 498 | case CHttpConnectionManager::EConnectedAndAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 499 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 500 | // This is the ideal situation if the location matches, otherwise it | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 501 | // becomes the fourth choice | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 502 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[ii]->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 503 | if( connectionInfo.HostAndPortMatches(aConnectionInfo) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 504 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 505 | if(!connectMethod) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 506 | 				     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 507 | ++numConnectionsToSingleServer; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 508 | if( aCanPipeline ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 509 | 					     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 510 | // This is the backup-choice | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 511 | backupChoice = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 512 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 513 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 514 | 					    {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 515 | // This is the one! | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 516 | aManager = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 517 | newConnection = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 518 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 519 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 520 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 521 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 522 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 523 | // Non-matching connection info - fourth choice. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 524 | fourthChoice = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 525 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 526 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 527 | case CHttpConnectionManager::EConnectedAndBusy: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 528 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 529 | // This is the ideal choice if the pipelining can done and the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 530 | // location and secure status match. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 531 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[ii]->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 532 | TBool hostAndPortMatches = connectionInfo.HostAndPortMatches(aConnectionInfo); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 533 | if(hostAndPortMatches) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 534 |                 {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 535 | ++numConnectionsToSingleServer; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 536 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 537 | if( !connectMethod && aCanPipeline && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 538 | hostAndPortMatches && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 539 | connectionInfo.IsSecure() == aConnectionInfo.IsSecure() ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 540 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 541 | // This is the one! | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 542 | aManager = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 543 | newConnection = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 544 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 545 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 546 | case CHttpConnectionManager::EConnectedNotAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 547 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 548 | // Do nothing - continue the search... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 549 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 550 | case CHttpConnectionManager::EConnectingNotAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 551 | 	         {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 552 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[ii]->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 553 | TBool hostAndPortMatches = connectionInfo.HostAndPortMatches(aConnectionInfo); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 554 | if(hostAndPortMatches) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 555 | 	             {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 556 | ++numConnectionsToSingleServer; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 557 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 558 | if (aCanPipeline && hostAndPortMatches && connectionInfo.IsSecure() == aConnectionInfo.IsSecure()) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 559 | 	           {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 560 | // We are connecting. So do not initiate another connection. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 561 | // We will be able to send the request via the same connection. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 562 | managerConnecting = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 563 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 564 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 565 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 566 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 567 | // There are no other transport handler states - should not reach here | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 568 | User::Invariant(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 569 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 570 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 571 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 572 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 573 | if( aManager == NULL) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 574 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 575 | if( aCanPipeline && backupChoice != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 576 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 577 | // Use the connection manager that is connected to the correct | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 578 | // location but not busy. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 579 | aManager = backupChoice; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 580 | newConnection = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 581 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 582 | else if( secondChoice != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 583 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 584 | // Use the second choice connection manager - idle one. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 585 | aManager = secondChoice; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 586 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 587 | else if( numConnMan < MaxNumConnectionManagers() ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 588 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 589 | // Have not reached the max number of connection managers and so | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 590 | // can create a new connection manager - check for a transport layer | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 591 | if( iTransportLayer == NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 592 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 593 | // Create the transport layer | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 594 | _LIT8(KTcpProtocol, "TCP"); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 595 | THttpTransportConstructionParams params = THttpTransportConstructionParams(*this); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 596 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 597 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 598 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 599 | THTTPHdrVal valPriority; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 600 | RStringF strConnMan = stringPool.StringF(HTTP::ETranspHndlrPriority , iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 601 | params.iPriority = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 602 | if( connInfo.Property(strConnMan, valPriority) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 603 | 					{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 604 | if(valPriority== stringPool.StringF(HTTP::EEnableTranspHndlrPriority , iStringTable)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 605 | params.iPriority = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 606 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 607 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 608 | iTransportLayer = CHttpTransportLayer::NewL(KTcpProtocol, params); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 609 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 610 | // Check we are doing an optimal pipelining. Read the property value only | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 611 | // if we haven't created atleast one connection manager yet | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 612 | if(numConnMan == 0) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 613 | 			    {			  
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 614 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 615 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 616 | __ASSERT_DEBUG(!managerConnecting, User::Invariant()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 617 | THTTPHdrVal optimalPipelineValue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 618 | RStringF strOptimalPipeline = stringPool.StringF(HTTP::EHttpOptimalPipelining, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 619 | if(connInfo.Property(strOptimalPipeline, optimalPipelineValue)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 620 | 			        {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 621 | iEnableOptimalPipeline = (optimalPipelineValue == stringPool.StringF(HTTP::EHttpEnableOptimalPipelining, iStringTable)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 622 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 623 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 624 | if(managerConnecting) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 625 | 			    {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 626 | newConnection = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 627 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 628 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 629 | 			    {			    
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 630 | // Create the new connection manager | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 631 | const TInt maxNumberTransactionsToPipeline = MaxNumTransactionsToPipeline(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 632 | aManager = CHttpConnectionManager::NewL(iTransportLayer->SocketFactory(), *this, *iPipelineFallback, maxNumberTransactionsToPipeline, iEnableOptimalPipeline); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 633 | CleanupStack::PushL(aManager); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 634 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 635 | __RecordConnectionManagerCreationL(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 636 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 637 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 638 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 639 | aManager->__logger__ = this->__logger__; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 640 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 641 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 642 | // Append to the store | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 643 | User::LeaveIfError(iConnectionManagers.Append(aManager)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 644 | CleanupStack::Pop(aManager); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 645 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 646 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 647 | else if( fourthChoice != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 648 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 649 | // As a last resort reuse one that is connected to the wrong host but | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 650 | // not being used. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 651 | aManager = fourthChoice; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 652 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 653 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 654 | return newConnection; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 655 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 656 | |
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 657 | |
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 658 | CHttpConnectionManager* CHttpClientHandler::SelectTunnelConnectionL(const CHttpConnectionInfo& aConnectionInfo, RHTTPTransaction aTrans, TBool aCanPipeline) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 659 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 660 | // Look for connection manager that is a tunnel connection via appropriate | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 661 | // proxy to appropriate host. If the transaction can be pipelined, then the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 662 | // first choice is a connection manager that is connected and busy. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 663 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 664 | THTTPHdrVal hostVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 665 | #ifdef _DEBUG | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 666 | TBool found = | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 667 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 668 | aTrans.PropertySet().Property(stringPool.StringF(HTTP::ETunnel, iStringTable), hostVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 669 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 670 | __ASSERT_DEBUG( found, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 671 | __ASSERT_DEBUG( hostVal.Type() == THTTPHdrVal::KStrFVal, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 672 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 673 | RStringF host = hostVal.StrF(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 674 | TBool notifyCreateTunnel = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 675 | CHttpConnectionManager* manager = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 676 | CHttpConnectionManager* backupChoice = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 677 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 678 | const TInt numConnMan = iConnectionManagers.Count(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 679 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 680 | for( TInt ii=0; (ii < numConnMan && manager == NULL ); ++ii ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 681 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 682 | CHttpConnectionManager::TConnectionStatus status = iConnectionManagers[ii]->Status(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 683 | switch( status ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 684 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 685 | case CHttpConnectionManager::ENotConnected: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 686 | case CHttpConnectionManager::EConnectedNotAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 687 | case CHttpConnectionManager::EConnectingNotAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 688 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 689 | // Do nothing - continue search. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 690 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 691 | case CHttpConnectionManager::EConnectedAndAvailable: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 692 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 693 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[ii]->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 694 | if( connectionInfo.HostAndPortMatches(aConnectionInfo) && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 695 | iConnectionManagers[ii]->TunnelMatches(host) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 696 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 697 | // Location (ie the proxy) and tunnel host match - this is the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 698 | // backup choice if pipelining allowed, otherwise it is the one. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 699 | if( aCanPipeline ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 700 | 					{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 701 | // This is the backup choice... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 702 | backupChoice = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 703 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 704 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 705 | 					{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 706 | // This is the one! There is no need to create a tunnel. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 707 | manager = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 708 | notifyCreateTunnel = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 709 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 710 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 711 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 712 | case CHttpConnectionManager::EConnectedAndBusy: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 713 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 714 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[ii]->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 715 | if( aCanPipeline && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 716 | connectionInfo.HostAndPortMatches(aConnectionInfo) && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 717 | iConnectionManagers[ii]->TunnelMatches(host) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 718 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 719 | // Location (ie the proxy) and tunnel host match and pipelining | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 720 | // is allowed - this is the one! There is no need to create a | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 721 | // tunnel. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 722 | manager = iConnectionManagers[ii]; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 723 | notifyCreateTunnel = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 724 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 725 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 726 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 727 | // There are no other transport handler states - should not reach here | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 728 | User::Invariant(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 729 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 730 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 731 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 732 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 733 | if( manager == NULL && backupChoice != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 734 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 735 | // Use the back-up choice - now no need to create a tunnel. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 736 | manager = backupChoice; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 737 | notifyCreateTunnel = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 738 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 739 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 740 | if( manager != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 741 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 742 | 		__FLOG_1(_T8("!! Tunnel to %S available"), &host.DesC());
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 743 | __FLOG_6( | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 744 | 				_T8("-> Trans %d, Con %d : can service via host %S, remote port %d (secure : %d, nonpersistent : %d)"),
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 745 | aTrans.Id(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 746 | GetConnectionID(aTrans), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 747 | &manager->ConnectionInfo().Host(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 748 | manager->ConnectionInfo().Port(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 749 | manager->ConnectionInfo().IsSecure(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 750 | manager->ConnectionInfo().IsNonPersistent() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 751 | ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 752 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 753 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 754 | if( notifyCreateTunnel ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 755 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 756 | 		__FLOG_1(_T8("!! No tunnel to %S"), &host.DesC());
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 757 | 		__FLOG_2(_T8("-> Trans %d, Con %d : cannot service until tunnel established"), aTrans.Id(),GetConnectionID(aTrans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 758 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 759 | // Notify client (or filter) that a tunnel needs to be established | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 760 | // before this transaction can be serviced. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 761 | aTrans.SendEventL( | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 762 | THTTPEvent::ENeedTunnel, | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 763 | THTTPEvent::EIncoming, | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 764 | THTTPFilterHandle(THTTPFilterHandle::EProtocolHandler) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 765 | ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 766 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 767 | return manager; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 768 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 769 | |
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 770 | |
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 771 | /* | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 772 | * The below function selects correct NTLM connection manger. Connection manager is associate with a socket. | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 773 | * NTLM protocol needs all authentication messages Negotiate(->),Challenge(<-) and Authorise(->) packets | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 774 | * to be sent on the same port. In this function, the connection manager is identified by NTLM id which is set | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 775 | * when CHttpResponseParser when 401 unauthorised message is received from ntlm enabled server. | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 776 | * The same iNtlmConnId will be maintained until authentication is successful. | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 777 | */ | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 778 | CHttpConnectionManager* CHttpClientHandler::SelectNtlmConnectionL(const CHttpConnectionInfo& aConnectionInfo,RHTTPTransaction aTrans) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 779 |     {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 780 | |
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 781 | TInt ntlmConnId; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 782 | CHttpConnectionManager* fourthChoice=NULL; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 783 | _LIT8( KNtlmId, "NTLMConnId" ); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 784 | RStringPool stringPool = aTrans.Session().StringPool(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 785 | RStringF ntlmId = stringPool.OpenFStringL( KNtlmId ); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 786 | THTTPHdrVal value; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 787 | |
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 788 | if (aTrans.PropertySet().Property(ntlmId,value)) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 789 |         {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 790 | ntlmConnId = value.Int(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 791 | for (TInt i=0;i<iConnectionManagers.Count();i++) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 792 |             {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 793 | const CHttpConnectionInfo& connectionInfo = iConnectionManagers[i]->ConnectionInfo(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 794 | if( connectionInfo.HostAndPortMatches(aConnectionInfo) ) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 795 |                 {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 796 | if (iConnectionManagers[i]->GetNtlmConnId() == ntlmConnId) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 797 |                     {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 798 | ntlmId.Close(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 799 | return iConnectionManagers[i]; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 800 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 801 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 802 | else | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 803 |                 {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 804 | fourthChoice = iConnectionManagers[i]; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 805 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 806 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 807 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 808 | ntlmId.Close(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 809 | return fourthChoice; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 810 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 811 | |
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 812 | TInt CHttpClientHandler::MaxNumConnectionManagers() const | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 813 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 814 | // Has this value been previously cached? | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 815 | if( iMaxNumConnectionManagers == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 816 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 817 | // No. Use this default should the property not be set | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 818 | iMaxNumConnectionManagers = KMaxConnectionManagers; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 819 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 820 | // Check session properties | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 821 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 822 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 823 | THTTPHdrVal maxConnMan; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 824 | RStringF strConnMan = stringPool.StringF(HTTP::EMaxNumTransportHandlers, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 825 | if( connInfo.Property(strConnMan, maxConnMan) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 826 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 827 | if( maxConnMan.Type() == THTTPHdrVal::KTIntVal ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 828 | iMaxNumConnectionManagers = maxConnMan.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 829 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 830 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 831 | return iMaxNumConnectionManagers; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 832 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 833 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 834 | void CHttpClientHandler::SetupProxyInformation(RHTTPTransaction aTrans) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 835 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 836 | // Assume a direct connection unless the properties specifically indicate | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 837 | // that a proxy should be used. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 838 | iUseProxy = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 839 | iProxyAddress.Close(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 840 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 841 | RStringPool stringPool(iSession.StringPool()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 842 | THTTPHdrVal useProxy; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 843 | THTTPHdrVal address; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 844 | RStringF proxyUsage = stringPool.StringF(HTTP::EProxyUsage, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 845 | RStringF proxyAddress = stringPool.StringF(HTTP::EProxyAddress, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 846 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 847 | RHTTPPropertySet transactionProperties = aTrans.PropertySet(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 848 | RHTTPPropertySet sessionProperties = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 849 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 850 | // First check the transaction properties for proxy info. If the transaction | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 851 | // has its own proxy info set then this should be used, including the fact | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 852 | // that a proxy should not be used. Otherwise check the session properties | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 853 | // for proxy info. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 854 | if( transactionProperties.Property(proxyUsage, useProxy) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 855 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 856 | __ASSERT_DEBUG( useProxy.Type() == THTTPHdrVal::KStrFVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 857 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 858 | // The transaction has proxy info set... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 859 | iUseProxy = (useProxy.StrF().Index(iStringTable) == HTTP::EUseProxy); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 860 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 861 | if( iUseProxy ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 862 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 863 | if( transactionProperties.Property(proxyAddress, address) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 864 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 865 | __ASSERT_DEBUG( address.Type() == THTTPHdrVal::KStrFVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 866 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 867 | iProxyAddress = address.StrF().Copy(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 868 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 869 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 870 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 871 | // It is invalid to specify using a proxy and not set a proxy | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 872 | // address! | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 873 | THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 874 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 875 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 876 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 877 | else if( sessionProperties.Property(proxyUsage, useProxy) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 878 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 879 | __ASSERT_DEBUG( useProxy.Type() == THTTPHdrVal::KStrFVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 880 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 881 | // The session has proxy info set... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 882 | iUseProxy = (useProxy.StrF().Index(iStringTable) == HTTP::EUseProxy); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 883 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 884 | if( iUseProxy ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 885 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 886 | if( sessionProperties.Property(proxyAddress, address) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 887 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 888 | __ASSERT_DEBUG( address.Type() == THTTPHdrVal::KStrFVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 889 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 890 | iProxyAddress = address.StrF().Copy(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 891 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 892 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 893 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 894 | // It is invalid to specify using a proxy and not set a proxy | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 895 | // address! | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 896 | THttpClientPanic::Panic(THttpClientPanic::EInvalidProxySetting); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 897 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 898 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 899 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 900 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 901 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 902 | TBool CHttpClientHandler::CheckPipelineSupport(RHTTPTransaction aTrans) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 903 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 904 | // Check to see if the pipelining support has been disabled/enabled for this | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 905 | // transaction. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 906 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 907 | RStringF pipeline = stringPool.StringF(HTTP::EHttpPipelining, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 908 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 909 | TBool canPipeline = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 910 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 911 | if( aTrans.PropertySet().Property(pipeline, value) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 912 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 913 | __ASSERT_DEBUG( value.Type() == THTTPHdrVal::KStrFVal, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 914 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 915 | canPipeline = (value.StrF().Index(iStringTable) != HTTP::EDisablePipelining); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 916 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 917 | return canPipeline; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 918 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 919 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 920 | /* | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 921 | * Methods from CProtocolHandler | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 922 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 923 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 924 | TInt CHttpClientHandler::SessionServerCert(TCertInfo& /*aServerCert*/) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 925 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 926 | return KErrNotSupported; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 927 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 928 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 929 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 930 | TInt CHttpClientHandler::TransactionServerCert(TCertInfo& aServerCert, RHTTPTransaction aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 931 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 932 | TInt error = KErrNotFound; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 933 | const CX509Certificate* cert = static_cast<const CX509Certificate*>(TransactionServerCert(aTransaction)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 934 | if(cert) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 935 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 936 | TRAPD( failed, GetCertInfoL(*cert, aServerCert)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 937 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 938 | // pass back the leaving system error. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 939 | error = (failed < 0 ) ? failed : KErrNone; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 940 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 941 | return error; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 942 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 943 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 944 | void CHttpClientHandler::CreateCodecL() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 945 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 946 | iCodec = CHeaderCodecPlugin::NewL( KHttpClientCodecName, iSession.StringPool()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 947 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 948 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 949 | CProtTransaction* CHttpClientHandler::CreateProtTransactionL(RHTTPTransaction aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 950 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 951 | // Create the appropriate CProtTransaction object | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 952 | CHttpClientTransaction* transaction = CHttpClientTransaction::NewL(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 953 | return transaction; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 954 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 955 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 956 | TBool CHttpClientHandler::ServiceL(CProtTransaction& aTrans) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 957 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 958 | __START_PERFORMANCE_LOGGER(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 959 | // Prepare the transaction... | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 960 | TBool needTunnel = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 961 | TBool canPipeline = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 962 | CHttpConnectionInfo* info = PrepareTransactionL(aTrans.Transaction(), needTunnel, canPipeline); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 963 | CleanupStack::PushL(info); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 964 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 965 | CHttpConnectionManager* manager = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 966 | TBool isNewConnection = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 967 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 968 | if( needTunnel ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 969 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 970 | // Find a connection that is tunnelling via appropriate proxy to the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 971 | // appropriate host. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 972 | manager = SelectTunnelConnectionL(*info, aTrans.Transaction(), canPipeline); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 973 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 974 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 975 | 		{
 | 
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 976 | THTTPHdrVal value; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 977 | _LIT8( KNtlmStateStr, "NTLMState" ); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 978 | RStringPool stringPool = iSession.StringPool(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 979 | RStringF strF = stringPool.OpenFStringL( KNtlmStateStr ); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 980 | CleanupClosePushL(strF); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 981 | if ( aTrans.Transaction().PropertySet().Property( strF, value ) && (value.Int() == ENtlmNegotiate || value.Int() == ENtlmAuthenticate) ) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 982 |             {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 983 | manager = SelectNtlmConnectionL(*info,aTrans.Transaction()); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 984 | if (manager == NULL) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 985 |                 {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 986 |                 __FLOG_0(_T8("No NTLM connection manger!!!"));
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 987 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 988 | else if (value.Int() == ENtlmAuthenticate) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 989 |                 {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 990 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 991 |                 __FLOG_1(_T8(" NTLM AUTH msg Id %d and resetting to  -1"),manager->GetNtlmConnId());
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 992 | #endif | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 993 | manager->SetNtlmConnId(KErrNotFound);//reset it | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 994 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 995 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 996 | else// Look for a normal connection. | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 997 |             {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 998 | isNewConnection = SelectConnectionManagerL(*info, aTrans.Transaction(), canPipeline, manager); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 999 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1000 | CleanupStack::PopAndDestroy(&strF); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1001 | } | 
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1002 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1003 | if( manager != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1004 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1005 | // Pass the connection manager to the transaction - need to do this | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1006 | // before creating tx- and rx- data objects. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1007 | CHttpClientTransaction* trans = static_cast<CHttpClientTransaction*>(&aTrans); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1008 | trans->SetConnectionManager(*manager); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1009 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1010 | if(isNewConnection) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1011 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1012 | //Increment retry count only if it is a new connection. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1013 | trans->IncRetryCount(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1014 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1015 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1016 | // Create the tx- and rx- objects in the transaction | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1017 | aTrans.CreateTxDataL(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1018 | aTrans.CreateRxDataL(*this); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1019 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1020 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1021 | CHttpRequestComposer* composer = static_cast<CHttpRequestComposer*>(&aTrans.TxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1022 | CHttpResponseParser* parser = static_cast<CHttpResponseParser*>(&aTrans.RxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1023 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1024 | composer->__logger__ = this->__logger__; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1025 | parser->__logger__ = this->__logger__; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1026 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1027 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1028 | // If the transaction cannot be pipelined, then set the connection | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1029 | // manager to not allow pipelining. Once this transaction has completed | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1030 | // the manager will revert to allowing pipelining. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1031 | if( !canPipeline ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1032 | manager->DisablePipelining(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1033 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1034 | // Remove connection info from cleanup stack before submiting to the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1035 | // connection manager - ownership is passed to the connection manager. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1036 | CleanupStack::Pop(info); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1037 | MHttpRequest& request = static_cast<CHttpRequestComposer&>(aTrans.TxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1038 | MHttpResponse& response = static_cast<CHttpResponseParser&>(aTrans.RxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1039 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1040 | manager->SubmitL(*info, request, response); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1041 | 		__END_PERFORMANCE_LOGGER(_L(",CHttpClientHandler::ServiceL()"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1042 | return ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1043 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1044 | CleanupStack::PopAndDestroy(info); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1045 | 		__END_PERFORMANCE_LOGGER(_L(",CHttpClientHandler::ServiceL()"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1046 | return EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1047 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1048 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1049 | void CHttpClientHandler::ClosedTransactionHook(CProtTransaction* aTrans) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1050 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1051 | 	__FLOG_0(_T8("!! Closing transaction - client request"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1052 | 	__FLOG_1(_T8("-> Trans %d : closed"), aTrans->Transaction().Id());
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1053 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1054 | delete aTrans; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1055 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1056 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1057 | void CHttpClientHandler::CancelTransactionHook(CProtTransaction& aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1058 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1059 | // Is this transaction still alive - check to see if it still has a | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1060 | // connection manager. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1061 | CHttpClientTransaction& trans = static_cast<CHttpClientTransaction&>(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1062 | CHttpConnectionManager* manager = trans.ConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1063 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1064 | 	__FLOG_0(_T8("!! Cancelling transaction - client request"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1065 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1066 | if( manager != NULL ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1067 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1068 | 		__FLOG_2(_T8("-> Trans %d, Con %d : still alive - cancelling its connection manager"), aTransaction.Transaction().Id(),GetConnectionID(manager));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1069 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1070 | // Transaction is still alive - ask its connection manager to cancel it. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1071 | MHttpRequest& request = static_cast<CHttpRequestComposer&>(aTransaction.TxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1072 | MHttpResponse& response = static_cast<CHttpResponseParser&>(aTransaction.RxData()); | 
| 7 
2611c08ee28e
Revision: 201011
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
0diff
changeset | 1073 | response.FlushBodyDataIfNotRead(); | 
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1074 | manager->CancelSubmission(request, response); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1075 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1076 | // Connection is now cancelled - remove the connection manager from the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1077 | // transaction. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1078 | trans.RemoveConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1079 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1080 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1081 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1082 | 		__FLOG_1(_T8("-> Trans %d : already finished - nothing to do"), aTransaction.Transaction().Id());
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1083 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1084 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1085 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1086 | void CHttpClientHandler::NotifyNewRequestBodyPart(CProtTransaction& aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1087 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1088 | // Notify the transaction of more data. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1089 | static_cast<CHttpRequestComposer&>(aTransaction.TxData()).NotifyMoreRequestBodyData(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1090 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1091 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1092 | void CHttpClientHandler::GetInterfaceL(TUid aInterfaceId, MProtHandlerInterface*& aInterfacePtr) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1093 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1094 | switch(aInterfaceId.iUid) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1095 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1096 | case KProtHandlerTransactionServerCertUid: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1097 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1098 | aInterfacePtr = this; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1099 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1100 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1101 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1102 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1103 | CProtocolHandler::GetInterfaceL(aInterfaceId, aInterfacePtr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1104 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1105 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1106 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1107 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1108 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1109 | /* | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1110 | * Methods from MConnectionPrefsProvider | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1111 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1112 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1113 | TBool CHttpClientHandler::SupplyCommsConnection( RConnection*& aConnectionPtr ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1114 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1115 | aConnectionPtr = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1116 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1117 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1118 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1119 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1120 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1121 | TBool hasValue = connInfo.Property( stringPool.StringF(HTTP::EHttpSocketConnection, iStringTable), value ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1122 | if( hasValue && value.Type() == THTTPHdrVal::KTIntVal ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1123 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1124 | aConnectionPtr = reinterpret_cast<RConnection*>(value.Int()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1125 | return ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1126 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1127 | return EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1128 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1129 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1130 | TBool CHttpClientHandler::SupplySocketServerHandle ( TInt& aSocketServerHandle ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1131 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1132 | aSocketServerHandle = 0; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1133 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1134 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1135 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1136 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1137 | TBool hasValue = connInfo.Property(stringPool.StringF(HTTP::EHttpSocketServ, iStringTable), value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1138 | if( hasValue && value.Type() == THTTPHdrVal::KTIntVal ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1139 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1140 | aSocketServerHandle = value.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1141 | return ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1142 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1143 | return EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1144 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1145 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1146 | void CHttpClientHandler::SetCommsConnectionL( RConnection* aConnectionPtr ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1147 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1148 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1149 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1150 | TInt connectionPtrVal = reinterpret_cast<TInt>(aConnectionPtr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1151 | connInfo.SetPropertyL ( stringPool.StringF(HTTP::EHttpSocketConnection, iStringTable ), THTTPHdrVal (connectionPtrVal) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1152 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1153 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1154 | void CHttpClientHandler::SetSocketServerHandleL ( TInt aSocketServerHandle ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1155 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1156 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1157 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1158 | connInfo.SetPropertyL ( stringPool.StringF(HTTP::EHttpSocketServ, iStringTable ), THTTPHdrVal (aSocketServerHandle) ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1159 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1160 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1161 | void CHttpClientHandler::GetSecurityPrefs(TBool& aDialogPrompt, MSecurityPolicy*& aSecurityPolicy) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1162 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1163 | // Set the security policy | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1164 | aSecurityPolicy = iSecurityPolicy; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1165 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1166 | // Set the dialog info - check the session properties | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1167 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1168 | RStringF secureDialog = iSession.StringPool().StringF(HTTP::ESecureDialog, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1169 | TBool hasValue = iSession.ConnectionInfo().Property(secureDialog, value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1170 | if( hasValue && value.Type() == THTTPHdrVal::KStrFVal && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1171 | value.StrF().Index(iStringTable) == HTTP::EDialogNoPrompt ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1172 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1173 | // Client has requested to not be prompted | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1174 | aDialogPrompt = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1175 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1176 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1177 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1178 | // The default value - the client will be prompted | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1179 | aDialogPrompt = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1180 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1181 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1182 | |
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1183 | void CHttpClientHandler::GetSecurityPrefs(MSecurityPolicy*& aSecurityPolicy, TInt& aDialogPref) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1184 | 	{
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1185 | // Set the security policy | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1186 | aSecurityPolicy = iSecurityPolicy; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1187 | |
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1188 | // Set the dialog info - check the session properties | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1189 | THTTPHdrVal value; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1190 | RStringF secureDialog = iSession.StringPool().StringF(HTTP::ESecureDialog, iStringTable); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1191 | TBool hasValue = iSession.ConnectionInfo().Property(secureDialog, value); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1192 | if( hasValue && value.Type() == THTTPHdrVal::KStrFVal && | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1193 | value.StrF().Index(iStringTable) == HTTP::EDialogNoPrompt ) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1194 | 		{
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1195 | // Client has requested to not be prompted | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1196 | aDialogPref = CHttpTransportLayer::ETHttpDialogModeUnattended; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1197 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1198 | else if ( hasValue && value.Type() == THTTPHdrVal::KStrFVal && | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1199 | value.StrF().Index(RHTTPSession::GetTable()) == HTTP::EDialogAutomaticAllowed ) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1200 | 		{
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1201 | aDialogPref = CHttpTransportLayer::ETHttpDialogModeAllowAutomatic; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1202 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1203 | else | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1204 | 		{
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1205 | // The default value - the client will be prompted | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1206 | aDialogPref = CHttpTransportLayer::ETHttpDialogModeAttended; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1207 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1208 | } | 
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1209 | TBool CHttpClientHandler::ImmediateSocketShutdown() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1210 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1211 | TBool immediateSocketShutdown = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1212 | if( *iSessionClosingPtr ) // iSessionClosingPtr cannot be NULL as its is set in ConstructL | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1213 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1214 | // Session is closing down, check the session properties to check if the client has requested | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1215 | // an immediate socket shutdown | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1216 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1217 | RStringF socketShutdownMode = iSession.StringPool().StringF(HTTP::ESocketShutdownMode, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1218 | TBool hasValue = iSession.ConnectionInfo().Property(socketShutdownMode, value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1219 | if( hasValue && value.Type() == THTTPHdrVal::KStrFVal && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1220 | value.StrF().Index(iStringTable) == HTTP::ESocketShutdownImmediate ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1221 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1222 | 			__FLOG_0(_T8("!! Immediate socket shutdown requested by client"));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1223 | immediateSocketShutdown = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1224 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1225 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1226 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1227 | return immediateSocketShutdown; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1228 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1229 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1230 | TInt CHttpClientHandler::SessionId() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1231 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1232 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1233 | TInt result = KErrNotFound; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1234 | const TBool hasValue = iSession.ConnectionInfo().Property(iSession.StringPool().StringF(HTTP::ESessionId, iStringTable), value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1235 | if( hasValue && value.Type()==THTTPHdrVal::KTIntVal) // silently ignore inappropriate types | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1236 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1237 | result = value.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1238 | if(result<0) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1239 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1240 | result = KErrNotFound; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1241 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1242 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1243 | return result; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1244 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1245 | |
| 18 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1246 | TInt CHttpClientHandler::GetSocketImmediateCloseTimeout() | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1247 |     {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1248 | THTTPHdrVal value; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1249 | TInt result = KErrNotFound; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1250 | const TBool hasValue = iSession.ConnectionInfo().Property(iSession.StringPool().StringF(HTTP::EHttpSocketImmediateClosetTimeOutValue, iStringTable), value); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1251 | if( hasValue && value.Type()==THTTPHdrVal::KTIntVal) // silently ignore inappropriate types | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1252 |         {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1253 | result = value.Int(); | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1254 | if(result<0) | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1255 |             {
 | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1256 | result = KErrNotFound; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1257 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1258 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1259 | return result; | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1260 | } | 
| 
5f1cd966e0d9
Revision: 201029
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: 
7diff
changeset | 1261 | |
| 0 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1262 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1263 | /* | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1264 | * Methods from MRxDataObserver | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1265 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1266 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1267 | TInt CHttpClientHandler::SetStatus(CRxData& aRxData, TInt aStatus) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1268 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1269 | // Have received a status message from an Rx data object - check the status. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1270 | CHttpClientTransaction& protTrans = static_cast<CHttpClientTransaction&>(aRxData.ProtTrans()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1271 | RHTTPTransaction trans = protTrans.Transaction(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1272 | TInt err = KErrNone; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1273 | switch( aStatus ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1274 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1275 | case THTTPEvent::EResponseComplete: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1276 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1277 | 		__FLOG_2(_T8("Trans %d, Con %d : transaction completed"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1278 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1279 | // The response is complete - the client has been passed all the data | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1280 | // and released it. Check to see if this was a CONNECT request. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1281 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1282 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1283 | TInt status = aStatus; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1284 | if( trans.Request().Method().Index(iStringTable) == HTTP::ECONNECT ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1285 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1286 | if( HTTPStatus::IsSuccessful(trans.Response().StatusCode()) ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1287 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1288 | // A 2xx status code - tunnel has been successfully established. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1289 | // Mark the connection manager as tunnelled connection, providing | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1290 | // the host to which the tunnel leads. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1291 | THTTPHdrVal hostVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1292 | #ifdef _DEBUG | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1293 | TBool found = | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1294 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1295 | trans.PropertySet().Property(stringPool.StringF(HTTP::ETunnel, iStringTable), hostVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1296 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1297 | __ASSERT_DEBUG( found, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1298 | __ASSERT_DEBUG( hostVal.Type() == THTTPHdrVal::KStrFVal, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1299 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1300 | protTrans.ConnectionManager()->TunnelConnection(hostVal.StrF()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1301 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1302 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1303 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1304 | status = THTTPEvent::EFailed; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1305 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1306 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1307 | THTTPHdrVal hostVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1308 | TBool found = trans.PropertySet().Property(stringPool.StringF(HTTP::ETunnel, iStringTable), hostVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1309 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1310 | __ASSERT_DEBUG( found, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1311 | __ASSERT_DEBUG( hostVal.Type() == THTTPHdrVal::KStrFVal, User::Invariant() ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1312 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1313 | const CHttpConnectionInfo& connectionInfo = protTrans.ConnectionManager()->ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1314 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1315 | __FLOG_2( | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1316 | 						_T8("!! Tunnel failed : %d %S"),
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1317 | trans.Response().StatusCode(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1318 | &trans.Response().StatusText().DesC() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1319 | ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1320 | __FLOG_5( | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1321 | 						_T8("-> Tunnel to %S on connection to host %S, remote port %d (secure : %d, nonpersistent : %d)"),
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1322 | &hostVal.StrF().DesC(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1323 | &connectionInfo.Host(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1324 | connectionInfo.Port(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1325 | connectionInfo.IsSecure(), | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1326 | connectionInfo.IsNonPersistent() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1327 | ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1328 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1329 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1330 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1331 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1332 | // Ensure that the connection manager is still not dealing with this | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1333 | // request. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1334 | MHttpRequest& request = static_cast<CHttpRequestComposer&>(protTrans.TxData()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1335 | protTrans.ConnectionManager()->CheckRequestComplete(request); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1336 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1337 | // The transaction has no further use for the connection manager - it | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1338 | // can now be removed. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1339 | protTrans.RemoveConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1340 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1341 | // The transaction is now complete - inform the base class. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1342 | err = TransactionCompleted(trans, status); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1343 | } break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1344 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1345 | // Unknown status - do nothing, unless an error | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1346 | if( aStatus < 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1347 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1348 | 			__FLOG_1(_T8("!! Error : %d"), aStatus);
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1349 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1350 | if( aStatus == KErrHttpPipeliningError ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1351 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1352 | 				__FLOG_2(_T8("-> Trans %d, Con %d : transaction was being pipelined"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1353 | 				__FLOG_2(_T8("-> Trans %d, Con %d : re-try without pipelining"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1354 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1355 | // Specify that this transaction should not be pipelined when | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1356 | // it is re-submitted. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1357 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1358 | RStringF pipeline = stringPool.StringF(HTTP::EHttpPipelining, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1359 | RStringF disable = stringPool.StringF(HTTP::EDisablePipelining, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1360 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1361 | err = trans.PropertySet().SetProperty(pipeline, disable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1362 | if(err != KErrNone) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1363 | 				    {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1364 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1365 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1366 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1367 | #if defined (_DEBUG) && defined (_LOGGING) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1368 | else if( aStatus == KErrHttpNonPipeliningError ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1369 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1370 | 				__FLOG_2(_T8("-> Trans %d, Con %d : transaction was being pipelined"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1371 | 				__FLOG_2(_T8("-> Trans %d, Con %d : re-try with pipelining again"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1372 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1373 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1374 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1375 | 				__FLOG_2(_T8("-> Trans %d, Con %d : transaction failed"), trans.Id(), GetConnectionID(trans));
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1376 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1377 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1378 | // An error code has occured. As no further data will be exchanged | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1379 | // with the origin server. The connection manager can now be removed. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1380 | protTrans.RemoveConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1381 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1382 | if( aStatus == KErrEof ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1383 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1384 | 				__FLOG_4(_T8("-> Trans %d, Con %d : reporting %d (KErrDisconnected) instead of %d"), trans.Id(), GetConnectionID(trans), KErrDisconnected, aStatus);				
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1385 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1386 | // Convert these errors to KErrDisconnected | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1387 | aStatus = KErrDisconnected; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1388 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1389 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1390 | // Propagate the error back to the client and mark this transaction | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1391 | // as completed. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1392 | err = TransactionCompleted(trans, aStatus); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1393 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1394 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1395 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1396 | return err; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1397 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1398 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1399 | void CHttpClientHandler::SetStatusL(CRxData& aRxData, TInt aStatus) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1400 |     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1401 | User::LeaveIfError(SetStatus(aRxData, aStatus)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1402 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1403 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1404 | /* | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1405 | * Methods from MHttpBatchingPropertiesCallback | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1406 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1407 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1408 | TInt CHttpClientHandler::GetMaxBatchingBufferSize() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1409 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1410 | TInt batchingBuffer = 0; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1411 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1412 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1413 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1414 | THTTPHdrVal doBatching; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1415 | RStringF batchingSetting = stringPool.StringF(HTTP::EHttpBatching, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1416 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1417 | if (connInfo.Property(batchingSetting, doBatching)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1418 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1419 | TBool batchingSupported = EFalse; // default behaviour is batching disabled | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1420 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1421 | // First of all check if batching has been enabled | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1422 | batchingSupported = (doBatching.StrF().Index(iStringTable) == HTTP::EEnableBatching); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1423 | if (batchingSupported) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1424 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1425 | THTTPHdrVal bufferSize; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1426 | RStringF buffer = stringPool.StringF(HTTP::EBatchingBufferSize, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1427 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1428 | // If batching has been enabled, check for a client-specified buffer size to use | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1429 | if (connInfo.Property(buffer, bufferSize)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1430 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1431 | __ASSERT_DEBUG(bufferSize.Type() == THTTPHdrVal::KTIntVal, THttpClientPanic::Panic(THttpClientPanic::EInvalidBatchingSetting)); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1432 | batchingBuffer = bufferSize.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1433 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1434 | // No client-specified buffer size therefore use the default value | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1435 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1436 | batchingBuffer = KDefaultBatchingBufSize; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1437 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1438 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1439 | return batchingBuffer; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1440 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1441 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1442 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1443 | /* | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1444 | * Methods from MProtHandlerInterface | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1445 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1446 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1447 | const CCertificate* CHttpClientHandler::SessionServerCert() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1448 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1449 | return NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1450 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1451 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1452 | const CCertificate* CHttpClientHandler::TransactionServerCert(RHTTPTransaction aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1453 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1454 | const CProtTransaction* trans = FindProtocolTransaction(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1455 | if(trans != NULL) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1456 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1457 | CHttpConnectionManager* manager = static_cast<const CHttpClientTransaction*>(trans)->ConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1458 | if( manager ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1459 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1460 | return manager->ServerCert(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1461 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1462 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1463 | return NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1464 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1465 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1466 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1467 | void CHttpClientHandler::MHFRunL(RHTTPTransaction aTransaction, const THTTPEvent& aEvent) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1468 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1469 | // Handle the event | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1470 | switch (aEvent.iStatus) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1471 | 		    {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1472 | case THTTPEvent::EGetCipherSuite: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1473 | 		    {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1474 | GetCipherSuiteL(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1475 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1476 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1477 | case THTTPEvent::ECancelWaitFor100Continue: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1478 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1479 | const CProtTransaction* pT = FindProtocolTransaction(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1480 | if(pT != NULL) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1481 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1482 | static_cast<CHttpRequestComposer&>(pT->TxData()).CancelWaitFor100Continue(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1483 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1484 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1485 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1486 | default: | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1487 | CProtocolHandler::MHFRunL(aTransaction,aEvent); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1488 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1489 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1490 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1491 | void CHttpClientHandler::GetCipherSuiteL(RHTTPTransaction aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1492 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1493 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1494 | RHTTPTransactionPropertySet properties(aTransaction.PropertySet()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1495 | const CProtTransaction* transaction = FindProtocolTransaction(aTransaction); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1496 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1497 | if (transaction != NULL) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1498 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1499 | CHttpConnectionManager* connectionManager = static_cast<const CHttpClientTransaction*>(transaction)->ConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1500 | if(connectionManager) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1501 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1502 | TBuf8<8> cipherSuite; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1503 | TInt error = connectionManager->CipherSuite(cipherSuite); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1504 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1505 | if (error == KErrNone) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1506 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1507 | RString cipherSuiteString = stringPool.OpenStringL(cipherSuite); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1508 | THTTPHdrVal hdrValue(cipherSuiteString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1509 | CleanupClosePushL(cipherSuiteString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1510 | properties.SetPropertyL(stringPool.StringF(HTTP::ECipherSuiteValue, iStringTable), hdrValue); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1511 | CleanupStack::PopAndDestroy(&cipherSuiteString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1512 | return; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1513 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1514 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1515 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1516 | // No cipher suite could be obtained so set the ECipherSuiteValue property to an empty string. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1517 | properties.SetPropertyL(stringPool.StringF(HTTP::ECipherSuiteValue, iStringTable), THTTPHdrVal(RString())); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1518 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1519 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1520 | TInt CHttpClientHandler::MaxNumTransactionsToPipeline() const | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1521 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1522 | /* This is called when the first transaction is submitted. This is so filters can set the | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1523 | session setting HTTP::EMaxNumTransactionsToPipeline | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1524 | However it is only required to be set when the first transaction is submitted. Therefore | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1525 | check to see if the value is already cached. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1526 | */ | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1527 | if (iMaxNumTransactionsToPipeline == 0) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1528 |  		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1529 | iMaxNumTransactionsToPipeline = KDefaultMaxNumberTransactionsToPipeline; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1530 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1531 | // Check session properties | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1532 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1533 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1534 | THTTPHdrVal maxToPipeline; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1535 | RStringF maxToPipelineString = stringPool.StringF(HTTP::EMaxNumTransactionsToPipeline, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1536 | if(connInfo.Property(maxToPipelineString, maxToPipeline)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1537 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1538 | if(maxToPipeline.Type() == THTTPHdrVal::KTIntVal) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1539 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1540 | iMaxNumTransactionsToPipeline = maxToPipeline.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1541 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1542 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1543 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1544 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1545 | return iMaxNumTransactionsToPipeline; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1546 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1547 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1548 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1549 | void CHttpClientHandler::__RecordConnectionManagerCreationL() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1550 | // In debug mode update a session property to record when each connection manager is created | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1551 | // This is used to validate the runtime behavior of pipelining use cases | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1552 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1553 | #if defined (_DEBUG) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1554 | _LIT8(KNumberConnectionManagers, "__NumConnectionManagers"); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1555 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1556 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1557 | RStringF numberConnectionsString = stringPool.OpenFStringL(KNumberConnectionManagers); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1558 | CleanupClosePushL(numberConnectionsString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1559 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1560 | TInt numberConnections =0; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1561 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1562 | THTTPHdrVal numberConnectionsVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1563 | if (connInfo.Property(numberConnectionsString, numberConnectionsVal)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1564 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1565 | numberConnections = numberConnectionsVal.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1566 | connInfo.RemoveProperty(numberConnectionsString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1567 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1568 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1569 | numberConnections++; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1570 | numberConnectionsVal.SetInt(numberConnections); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1571 | connInfo.SetPropertyL(numberConnectionsString, numberConnectionsVal); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1572 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1573 | CleanupStack::PopAndDestroy(&numberConnectionsString); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1574 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1575 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1576 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1577 | #if defined (_DEBUG) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1578 | TInt CHttpClientHandler::GetConnectionID( const CHttpConnectionManager* aConnectionManager ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1579 | //in debug mode it returns the connection ID, if not in the list returns 0 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1580 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1581 | TInt i = iConnectionManagers.Count(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1582 | for( ;i > 0; --i ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1583 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1584 | if( iConnectionManagers[i-1] == aConnectionManager ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1585 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1586 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1587 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1588 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1589 | return i; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1590 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1591 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1592 | TInt CHttpClientHandler::GetConnectionID( const RHTTPTransaction &aTrans ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1593 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1594 | CHttpConnectionManager* manager = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1595 | const CProtTransaction* trans = FindProtocolTransaction(aTrans); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1596 | if(trans != NULL) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1597 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1598 | manager = static_cast< const CHttpClientTransaction* >( trans )->ConnectionManager(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1599 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1600 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1601 | return GetConnectionID( manager ); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1602 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1603 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1604 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1605 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1606 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1607 | #endif | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1608 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1609 | void CHttpClientHandler::GetCertInfoL(const CX509Certificate& aSource, TCertInfo& aDest) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1610 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1611 | TInt len; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1612 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1613 | //Fetch Fingerprint | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1614 | len = Min(aSource.Fingerprint().Length(),aDest.iFingerprint.MaxLength()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1615 | aDest.iFingerprint.Copy(aSource.Fingerprint().Ptr(),len); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1616 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1617 | //Fetch SerialNumber | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1618 | len = Min(aSource.SerialNumber().Length(),aDest.iSerialNo.MaxLength()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1619 | aDest.iSerialNo.Copy(aSource.SerialNumber().Ptr(),len); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1620 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1621 | //Fetch PublicKey | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1622 | const CSubjectPublicKeyInfo& publicKeyInfo = aSource.PublicKey(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1623 | len = Min(publicKeyInfo.KeyData().Length(),aDest.iPublicKey.MaxLength()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1624 | aDest.iPublicKey.Copy(publicKeyInfo.KeyData().Ptr(),len); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1625 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1626 | //Fetch PublicKeyAlg | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1627 | aDest.iPkAlg= publicKeyInfo.AlgorithmId(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1628 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1629 | //Fetch VersionNo | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1630 | aDest.iVersionNo = aSource.Version(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1631 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1632 | //Fetch StartValDate | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1633 | const CValidityPeriod& validityPeriod = aSource.ValidityPeriod(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1634 | aDest.iStartValDate = validityPeriod.Start(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1635 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1636 | //Fetch EndValDate | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1637 | aDest.iEndValDate = validityPeriod.Finish(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1638 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1639 | //Fetch SubjectDNInfo | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1640 | const CX500DistinguishedName& subjectName = aSource.SubjectName(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1641 | GetDNInfo(subjectName,aDest.iSubjectDNInfo); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1642 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1643 | //Fetch IssuerDNInfo; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1644 | const CX500DistinguishedName& issuerName = aSource.IssuerName(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1645 | GetDNInfo(issuerName,aDest.iIssuerDNInfo); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1646 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1647 | // Fetch Alt Name | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1648 | aDest.iDNSName.Copy(KNullDesC); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1649 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1650 | //fetch digest alg | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1651 | aDest.iDigAlg = aSource.SigningAlgorithm().DigestAlgorithm().Algorithm(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1652 | const CX509CertExtension* ext = aSource.Extension(KSubjectAltName); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1653 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1654 | if( ext ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1655 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1656 | CX509AltNameExt* subjectAltName = CX509AltNameExt::NewLC(ext->Data()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1657 | const CArrayPtrFlat<CX509GeneralName>& gNs = subjectAltName->AltName(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1658 | const TInt count = gNs.Count(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1659 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1660 | for( TInt i = 0; i < count; ++i ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1661 | 			{ 
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1662 | const CX509GeneralName* gN = gNs.At(i); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1663 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1664 | if( gN->Tag() == EX509DNSName ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1665 | 				{ 
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1666 | CX509DNSName* dNS = CX509DNSName::NewLC(gN->Data()); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1667 | const TPtrC dNSValue = dNS->Name(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1668 | aDest.iDNSName.Copy(dNSValue); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1669 | CleanupStack::PopAndDestroy(dNS); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1670 | break; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1671 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1672 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1673 | CleanupStack::PopAndDestroy(subjectAltName); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1674 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1675 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1676 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1677 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1678 | void CHttpClientHandler::GetDNInfo(const CX500DistinguishedName& aSource, TDNInfo& aDest) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1679 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1680 | const TInt count = aSource.Count(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1681 | for( TInt i=0; i<count; ++i ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1682 | 		{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1683 | const CX520AttributeTypeAndValue& attribute = aSource.Element(i); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1684 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1685 | HBufC* valuePtr = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1686 | TDes8* destination = NULL; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1687 | TInt maxLength = 0 ; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1688 | TBool found = ETrue; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1689 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1690 | const TDesC& type = attribute.Type(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1691 | if( type.Compare(KX520CountryName) == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1692 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1693 | maxLength = aDest.iCountry.MaxLength(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1694 | destination = &aDest.iCountry; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1695 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1696 | else if( type.Compare(KX520OrganizationalUnitName) == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1697 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1698 | maxLength = aDest.iOrganizationUnit.MaxLength(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1699 | destination = &aDest.iOrganizationUnit; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1700 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1701 | else if( type.Compare(KX520OrganizationName) == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1702 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1703 | maxLength = aDest.iOrganization.MaxLength(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1704 | destination = &aDest.iOrganization; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1705 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1706 | else if( type.Compare(KX520CommonName) == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1707 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1708 | maxLength = aDest.iCommonName.MaxLength(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1709 | destination = &aDest.iCommonName; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1710 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1711 | else if( type.Compare(KX520LocalityName) == 0 ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1712 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1713 | maxLength = aDest.iLocality.MaxLength(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1714 | destination = &aDest.iLocality; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1715 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1716 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1717 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1718 | found = EFalse; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1719 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1720 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1721 | if( found ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1722 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1723 | TRAPD(ret, (valuePtr = attribute.ValueL())); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1724 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1725 | if( ret != KErrNone ) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1726 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1727 | // Non fatal error - just zero the descriptor | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1728 | destination->Zero(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1729 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1730 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1731 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1732 | TInt len = Min(valuePtr->Length(), maxLength); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1733 | TPtrC value = TPtrC(valuePtr->Des().Ptr(), len); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1734 | destination->Copy(value); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1735 | delete valuePtr; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1736 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1737 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1738 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1739 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1740 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1741 | TInt CHttpClientHandler::GetRecvBufferSize() | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1742 | 	{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1743 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1744 | iRecvBufferSize = KDefaultBufferSize; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1745 | // Check session properties | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1746 | RHTTPConnectionInfo connInfo = iSession.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1747 | RStringPool stringPool = iSession.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1748 | THTTPHdrVal value; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1749 | RStringF recvBufferSize = stringPool.StringF(HTTP::ERecvBufferSize, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1750 | if(connInfo.Property(recvBufferSize, value)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1751 | 			{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1752 | if(value.Type() == THTTPHdrVal::KTIntVal && value.Int() > 0) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1753 | 				{
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1754 | iRecvBufferSize = value.Int(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1755 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1756 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1757 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1758 | return iRecvBufferSize; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1759 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1760 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1761 | void CHttpClientHandler::EnsureStrictConnectMethodHeaders(RHTTPTransaction aTransaction) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1762 |     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1763 | // Check only for CONNECT method request | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1764 | // Strict & mandatory headers as needed by CONNECT request are | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1765 | // User-Agent, x-wap-profile, EProxyAuthorization | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1766 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1767 | RHTTPRequest request = aTransaction.Request(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1768 | RHTTPSession session = aTransaction.Session(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1769 | RStringPool sp = session.StringPool(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1770 | if(aTransaction.Request().Method().Index(iStringTable) == HTTP::ECONNECT) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1771 |         {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1772 | RStringF strictConnectHeaders = sp.StringF(HTTP::EStrictConnectHeaders, iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1773 | RHTTPPropertySet sessionProperties = session.ConnectionInfo(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1774 | THTTPHdrVal hdrVal; | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1775 | if(sessionProperties.Property(strictConnectHeaders, hdrVal) && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1776 | (hdrVal.Type() == THTTPHdrVal::KStrFVal) && | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1777 | (hdrVal.StrF().Index(iStringTable) == HTTP::EEnableStrictConnectHeaders)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1778 |             {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1779 | RStringF profileHeader = sp.OpenFStringL(KUAProfile); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1780 | CleanupClosePushL(profileHeader); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1781 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1782 | |
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1783 | RHTTPHeaders hdr = request.GetHeaderCollection(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1784 | THTTPHdrFieldIter it = hdr.Fields(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1785 | while(!it.AtEnd()) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1786 |                 {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1787 | RStringTokenF hdrStr = it(); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1788 | RStringF hdrNameStr = sp.StringF(hdrStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1789 | TInt hdrIndex = hdrNameStr.Index(iStringTable); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1790 | // Check if it is a UA/User-Agent/Proxy-Auhorization Profile header | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1791 | if((hdrNameStr == profileHeader) || (hdrIndex == HTTP::EUserAgent) || (hdrIndex == HTTP::EProxyAuthorization)) | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1792 |                     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1793 | ++it; // Keep going | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1794 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1795 | else | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1796 |                     {
 | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1797 | // Anything else remove the header and reset the iterator | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1798 | hdr.RemoveField(hdrNameStr); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1799 | it.First(); // Not so efficient. | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1800 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1801 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1802 | CleanupStack::PopAndDestroy(&profileHeader); | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1803 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1804 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1805 | } | 
| 
b16258d2340f
Revision: 201003
 Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com> parents: diff
changeset | 1806 |