webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp
branchRCL_3
changeset 41 4bd5176e1bc8
parent 40 8bfb9186a8b8
child 42 a1a5d4e727e8
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Tue May 11 17:13:44 2010 +0300
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Tue May 25 13:52:38 2010 +0300
@@ -83,10 +83,13 @@
 
 void DefersData::Activate()
 {
-    SetActive();
-    iStatus = KRequestPending;
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );
+    if(!IsActive())
+        {
+        SetActive();
+        iStatus = KRequestPending;
+        TRequestStatus* status = &iStatus;
+        User::RequestComplete( status, KErrNone );
+        }
 }
 
 
@@ -416,6 +419,11 @@
                     return;
                     }
                 }
+            if(httpStatus == EHttpNotAcceptable)
+                {
+                complete(KBrowserHTTPStatusCodes - m_transaction->Response().StatusCode());
+                return;
+                }
             if ( !handled )
                 {
                 // url
@@ -731,8 +739,11 @@
             // error handling
             //KErrDisconnected should be coming only for OCC
             //MHFRunL gets call before connection manager
-            if(aEvent.iStatus == KErrDisconnected)
+            if(aEvent.iStatus == KErrNotReady)
+                {
                 StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->setRetryConnectivityFlag();                 
+                StaticObjectsContainer::instance()->resourceLoaderDelegate()->httpSessionManager()->startTimer();    
+                }
             else
                 handleError(aEvent.iStatus);               
             break;