Changeset 45476 in vbox for trunk

Timestamp:

Apr 11, 2013 9:03:50 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Network manager: Network reply abort support.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (11 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -42 +42 @@
         : m_request(request)
         , m_iError(VINF_SUCCESS)
+        , m_pHttp(0)
     {
     }
@@ -49 +50 @@
     int error() const { return m_iError; }
 
+    /* API: Abort stuff: */
+    void abort()
+    {
+        /* Make sure http is created: */
+        if (!m_pHttp)
+            return;
+
+        /* Call for http abort: */
+        RTHttpAbort(m_pHttp);
+    }
+
 private:
 
@@ -58 +70 @@
 
         /* Create: */
-        RTHTTP hHttp;
-        m_iError = RTHttpCreate(&hHttp);
+        m_iError = RTHttpCreate(&m_pHttp);
 
         /* Setup proxy: */
@@ -65 +76 @@
         if (proxyManager.proxyEnabled())
         {
-            RTHttpSetProxy(hHttp,
+            RTHttpSetProxy(m_pHttp,
                            proxyManager.proxyHost().toAscii().constData(),
                            proxyManager.proxyPort().toUInt(), 0, 0);
@@ -86 +97 @@
             }
             const char **ppFormattedHeaders = formattedHeaderPointerVector.data();
-            RTHttpSetHeaders(hHttp, formattedHeaderPointerVector.size(), ppFormattedHeaders);
+            RTHttpSetHeaders(m_pHttp, formattedHeaderPointerVector.size(), ppFormattedHeaders);
         }
 
@@ -93 +104 @@
         {
             char *pszBuf = 0;
-            m_iError = RTHttpGet(hHttp,
+            m_iError = RTHttpGet(m_pHttp,
                                  m_request.url().toString().toAscii().constData(),
                                  &pszBuf);
@@ -101 +112 @@
 
         /* Destroy: */
-        RTHttpDestroy(hHttp);
+        RTHttpDestroy(m_pHttp);
+        m_pHttp = 0;
     }
 
@@ -107 +119 @@
     QNetworkRequest m_request;
     int m_iError;
+    RTHTTP m_pHttp;
     QByteArray m_reply;
 };
@@ -138 +151 @@
     {
         /* Terminate network-reply thread: */
+        m_pThread->abort();
         m_pThread->wait();
         delete m_pThread;
@@ -146 +160 @@
     void abort()
     {
-        m_error = QNetworkReply::OperationCanceledError;
-        emit finished();
+        m_pThread->abort();
     }
 
@@ -188 +201 @@
             case VINF_SUCCESS:
                 m_error = QNetworkReply::NoError;
+                break;
+            case VERR_HTTP_ABORTED:
+                m_error = QNetworkReply::OperationCanceledError;
                 break;
             case VERR_HTTP_NOT_FOUND: