equal
deleted
inserted
replaced
13 * |
13 * |
14 * Description: ?Description |
14 * Description: ?Description |
15 * |
15 * |
16 */ |
16 */ |
17 |
17 |
|
18 |
|
19 |
18 // INCLUDE FILES |
20 // INCLUDE FILES |
19 #include "HttpClientApp.h" |
21 #include "HttpClientApp.h" |
20 #include "HttpClientAppInstance.h" |
22 #include "HttpClientAppInstance.h" |
21 #include "HttpDownload.h" |
23 #include "HttpDownload.h" |
22 #include "HttpConnHandler.h" |
24 #include "HttpConnHandler.h" |
24 #include "FileExt.h" |
26 #include "FileExt.h" |
25 #include "HttpDownloadMgrLogger.h" |
27 #include "HttpDownloadMgrLogger.h" |
26 |
28 |
27 #include <in_sock.h> |
29 #include <in_sock.h> |
28 #include <CommDbConnPref.h> |
30 #include <CommDbConnPref.h> |
29 #include <httpfilterauthenticationinterface.h> |
31 #include <HttpFilterAuthenticationInterface.h> |
30 #include <uaproffilter_interface.h> |
32 #include <uaproffilter_interface.h> |
31 #include <httpfiltercommonstringsext.h> |
33 #include <HttpFilterCommonStringsExt.h> |
32 #include <cdblen.h> |
34 #include <cdblen.h> |
33 //#include <deflatefilterinterface.h> |
35 //#include <DeflateFilterInterface.h> |
34 #include <cookiefilterinterface.h> |
36 #include <CookieFilterInterface.h> |
35 #include <platform/mw/browser_platform_variant.hrh> |
|
36 #ifdef BRDO_OCC_ENABLED_FF |
|
37 #include <extendedconnpref.h> |
|
38 #endif |
|
39 |
37 |
40 // EXTERNAL DATA STRUCTURES |
38 // EXTERNAL DATA STRUCTURES |
41 //extern ?external_data; |
39 //extern ?external_data; |
42 |
40 |
43 // EXTERNAL FUNCTION PROTOTYPES |
41 // EXTERNAL FUNCTION PROTOTYPES |
288 CLOG_ATTACH( iShutDown, this ); |
286 CLOG_ATTACH( iShutDown, this ); |
289 |
287 |
290 iHttpSession.OpenL(); |
288 iHttpSession.OpenL(); |
291 CLOG_WRITE8( "Session open" ); |
289 CLOG_WRITE8( "Session open" ); |
292 InitSessionL(); |
290 InitSessionL(); |
293 |
|
294 //Set it to zero |
|
295 iIapId = 0; |
|
296 } |
291 } |
297 |
292 |
298 // ----------------------------------------------------------------------------- |
293 // ----------------------------------------------------------------------------- |
299 // CHttpConnHandler::NewL |
294 // CHttpConnHandler::NewL |
300 // Two-phased constructor. |
295 // Two-phased constructor. |
383 else |
378 else |
384 { |
379 { |
385 iPref.SetDialogPreference( ECommDbDialogPrefPrompt ); |
380 iPref.SetDialogPreference( ECommDbDialogPrefPrompt ); |
386 } |
381 } |
387 |
382 |
388 #ifdef BRDO_OCC_ENABLED_FF |
|
389 TExtendedConnPref extPref; |
|
390 CLOG_WRITE( "Setting OCC parameters"); |
|
391 CLOG_WRITE_1( "Iap: %d", iIapId ); |
|
392 if (iIapId) |
|
393 { |
|
394 CLOG_WRITE( "Iap is found"); |
|
395 extPref.SetSnapPurpose(CMManager::ESnapPurposeUnknown); |
|
396 extPref.SetIapId(iIapId); |
|
397 } |
|
398 else |
|
399 { |
|
400 CLOG_WRITE( "Using Internet Snap"); |
|
401 extPref.SetSnapPurpose(CMManager::ESnapPurposeInternet); |
|
402 } |
|
403 |
|
404 extPref.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent); |
|
405 TConnPrefList prefList; |
|
406 prefList.AppendL(&extPref); |
|
407 iConnection.Start( prefList, iStatus ); |
|
408 #else |
|
409 iConnection.Start( iPref, iStatus ); |
383 iConnection.Start( iPref, iStatus ); |
410 #endif //BRDO_OCC_ENABLED_FF |
|
411 |
384 |
412 // RConnection will complete us. |
385 // RConnection will complete us. |
413 doComplete = EFalse; |
386 doComplete = EFalse; |
414 } |
387 } |
415 |
388 |