MCL/sf/mw/web: comparison browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp

equal deleted inserted replaced

-:1f3c3f2f5b0a
+:c711bdda59f4
 void CHttpConnStageNotifier::RunL()
 {
 if( iStatus == KErrNone )
 {
 TInt stage = iProgressBuf().iStage;
+if ( iProgressBuf().iStage == KLinkLayerClosed && iProgressBuf().iError == KErrDisconnected )
+iConnHandler->RetryNeeded(ETrue);
 iConnHandler->ConnectionStageChanged( stage );
-if( stage > KConnectionUninitialised )
+if( stage != KLinkLayerClosed )
 // connection is still alive
 {
 iConnHandler->Connection().ProgressNotification( iProgressBuf, iStatus );
 SetActive();
 }
 CLOG_WRITE8( "Session open" );
 InitSessionL();
 	//Set it to zero
 	iIapId = 0;
+	iRetryNeeded = EFalse;
 }
 // -----------------------------------------------------------------------------
 // CHttpConnHandler::NewL
 // Two-phased constructor.
 {
 CLOG_WRITE8_1( "Stage: %d", aStage );
 iConnStage = aStage;
-if( iConnStage == KConnectionUninitialised ||
+if( iConnStage == KLinkLayerClosed ||
 iConnStage == KDataTransferTemporarilyBlocked
 )
 {
 __ASSERT_DEBUG( iClientApp, DMPanic( KErrCorrupt ) );
 CArrayPtrFlat<CHttpDownload>* downloads =
 iClientApp->Downloads();
 for( TInt i = 0; i < downloads->Count(); ++i )
 {
+if(iRetryNeeded  && ((*downloads)[i]->State() == EHttpDlMultipleMOFailed ||
+(*downloads)[i]->State() == EHttpDlInprogress ))
+{
+(*downloads)[i]->SetRetryFlag(ETrue);
+}
+}
+for( TInt i = 0; i < downloads->Count(); ++i )
+{
 if( (*downloads)[i]->ConnHandler() == this )
 {
-if( iConnStage == KConnectionUninitialised )
+if( iConnStage == KLinkLayerClosed )
 {
 // from now on this name is invalid -> forget it!
 delete iConnName; iConnName = NULL;
+(*downloads)[i]->Disconnected();
-(*downloads)[i]->Disconnected();
 }
 else
 {
 (*downloads)[i]->Suspended();
 }
 }
 }
-if( iConnStage == KConnectionUninitialised )
+if( iConnStage == KLinkLayerClosed )
 {
 ShutDown();
 }
 if ( iConnStage == KDataTransferTemporarilyBlocked )
 {
 else if( iConnStage == KLinkLayerOpen )
 // connection open
 {
 Connected();
 }
+iRetryNeeded = EFalse;
 }
 // -----------------------------------------------------------------------------
 // CHttpConnHandler::ConnectionError
 // ?implementation_description

branch	RCL_3
changeset 36	c711bdda59f4
parent 34	220a17280356
child 48	79859ed3eea9