MCL/sf/mw/web: comparison webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp

equal deleted inserted replaced

-:4917f9bf7995
+:8bfb9186a8b8
 }
 void HttpConnection::submitL()
 {
 __ASSERT_DEBUG( !m_transaction, THttpConnUtils::PanicLoader( KErrArgument ) );
+TBool retryFlag = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->getRetryConnectivityFlag();
+if( retryFlag )
+return;
 HttpSessionManager* httpSessionMgr = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager();
 User::LeaveIfNull(httpSessionMgr);
 httpSessionMgr->openHttpSessionIfNeededL();
 TPtrC8 urlPtr( m_handle->request().url().des() );
 break;// We don't process this event
 }
 default:
 {
 // error handling
-if(aEvent.iStatus == KErrNotReady || aEvent.iStatus == KErrDisconnected   )
+//KErrDisconnected should be coming only for OCC
+//MHFRunL gets call before connection manager
+if(aEvent.iStatus == KErrDisconnected)
 StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->setRetryConnectivityFlag();
 else
 handleError(aEvent.iStatus);
 break;
 }
 return ret;
 }
 void HttpConnection::complete(int error)
 {
-TBool retryFlag = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->getRetryConnectivityFlag();
+HttpSessionManager* httpSessionManager = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager();
+TBool retryFlag = httpSessionManager->getRetryConnectivityFlag();
 if( retryFlag )
 {
-m_transaction->Cancel();
-//m_cancelled = false; //for flash
 return;
 }
 if (m_defersData) {
 m_defersData->m_done = true;
 if (m_transaction) {
 m_transaction->Cancel();
 m_transaction->Close();
 delete m_transaction;
 m_transaction = NULL;
+httpSessionManager->removeRequest(this);
 }
 if (error) {
 CResourceHandleManager::self()->receivedFinished(m_handle, error, this);
 derefHandle();
 }
 __ASSERT_DEBUG( m_transaction, THttpConnUtils::PanicLoader( KErrArgument ) );
 if(uriParser.Parse( m_transaction->Request().URI().UriDes() ) == KErrNone)
 {
-if (uriParser.IsPresent(EUriHost) && uriParser.IsPresent(EUriScheme)) // looking only for absolue Url path and schemes other than http(s)
+if (uriParser.IsPresent(EUriScheme)) // looking only for absolue Url path and schemes other than http(s)
 {
 const TDesC8& scheme = uriParser.Extract(EUriScheme);
-if (scheme.FindF(_L8("http")) == KErrNotFound) // everything but http(s)
+if(uriParser.IsPresent(EUriHost) || scheme.FindF(_L8("tel")) == KErrNone)
 {
-TPtrC8 ptr(uriParser.UriDes());
+if (scheme.FindF(_L8("http")) == KErrNotFound) // everything but http(s)
-// these arrays are pushed into CleanupStack in case leave
-// if no leave, they will be freed below
-RArray<TUint>* typeArray = new (ELeave) RArray<TUint>(1);
-CleanupStack::PushL(typeArray);
-CDesCArrayFlat* desArray = new (ELeave) CDesCArrayFlat(1);
-CleanupStack::PushL(desArray);
-User::LeaveIfError(typeArray->Append(EParamRequestUrl));
-HBufC16* urlbuf = HBufC16::NewLC( ptr.Length()  + 1); // +1 for zero terminate
-urlbuf->Des().Copy( ptr );
-TPtr16 bufDes16 = urlbuf->Des();
-bufDes16.ZeroTerminate();
-desArray->AppendL(bufDes16);
-CleanupStack::Pop();
-MBrCtlSpecialLoadObserver* loadObserver = control(m_frame)->brCtlSpecialLoadObserver();
-if (loadObserver)
 {
-TRAP_IGNORE(loadObserver->HandleRequestL(typeArray, desArray));
+TPtrC8 ptr(uriParser.UriDes());
-}
+// these arrays are pushed into CleanupStack in case leave
+// if no leave, they will be freed below
-// No leave, so pop here and clean up
+RArray<TUint>* typeArray = new (ELeave) RArray<TUint>(1);
-CleanupStack::Pop(desArray);
+CleanupStack::PushL(typeArray);
-CleanupStack::Pop(typeArray);
+CDesCArrayFlat* desArray = new (ELeave) CDesCArrayFlat(1);
-// cleanup arrays
+CleanupStack::PushL(desArray);
-if (typeArray)
-{
+User::LeaveIfError(typeArray->Append(EParamRequestUrl));
-// Closes the array and frees all memory allocated to the array
-typeArray->Close();
+HBufC16* urlbuf = HBufC16::NewLC( ptr.Length()  + 1); // +1 for zero terminate
-delete typeArray;
+urlbuf->Des().Copy( ptr );
-}
+TPtr16 bufDes16 = urlbuf->Des();
+bufDes16.ZeroTerminate();
-if (desArray)
-{
+desArray->AppendL(bufDes16);
-// Deletes all descriptors from the array and frees the memory allocated to the array buffer
+CleanupStack::Pop();
-desArray->Reset();
-delete desArray;
+MBrCtlSpecialLoadObserver* loadObserver = control(m_frame)->brCtlSpecialLoadObserver();
-}
+if (loadObserver)
-return KErrCancel;
+{
+TRAP_IGNORE(loadObserver->HandleRequestL(typeArray, desArray));
+}
+// No leave, so pop here and clean up
+CleanupStack::Pop(desArray);
+CleanupStack::Pop(typeArray);
+// cleanup arrays
+if (typeArray)
+{
+// Closes the array and frees all memory allocated to the array
+typeArray->Close();
+delete typeArray;
+}
+if (desArray)
+{
+// Deletes all descriptors from the array and frees the memory allocated to the array buffer
+desArray->Reset();
+delete desArray;
+}
+return KErrCancel;
+}
 }
 }
 }
 return KErrNone;
 }
 RHTTPSession& session = StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->httpSession();
 // remove own address from transaction properties
 m_transaction->PropertySet().RemoveProperty(session.StringPool().StringF(HttpFilterCommonStringsExt::ESelfPtr,
 HttpFilterCommonStringsExt::GetTable()));
 m_transaction = NULL;
+m_isDone = true;
 return trans;
 }
 // -----------------------------------------------------------------------------
 // HttpConnection::addIMEINotifyPropertiesL

branch	RCL_3
changeset 40	8bfb9186a8b8
parent 38	4917f9bf7995
child 41	4bd5176e1bc8