Changeset 70785 in vbox

Timestamp:

Jan 29, 2018 10:42:01 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9104: Removing old redirection handling which is not working since we moved from Qt.network to cURL.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/net

Files:

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

-              r69550
+              r70785
         /** Returns value for the cached reply header of the passed @a type. */
         QString header(UINetworkReply::KnownHeader type) const;
-        /** Returns value for the cached reply attribute of the passed @a code. */
-        QVariant attribute(UINetworkReply::KnownAttribute code) const { /** @todo r=dsen: Fix that. */ Q_UNUSED(code); return QVariant(); }
         /** Returns short descriptive context of thread's current operation. */
 …
     /** Returns value for the cached reply header of the passed @a type. */
     QString header(UINetworkReply::KnownHeader type) const { return m_pThread->header(type); }
-    /** Returns value for the cached reply attribute of the passed @a code. */
-    QVariant attribute(UINetworkReply::KnownAttribute code) const { return m_pThread->attribute(code); }
 private slots:
 …
+}
-QVariant UINetworkReply::attribute(UINetworkReply::KnownAttribute code) const
+{
-    return m_pReply->attribute(code);
+}
 #include "UINetworkReply.moc"

-              r69500
+              r70785
     };
-    /** Known attribute types.
-      * Came from QtNetwork module.
-      * More to go on demand when necessary. */
-    enum KnownAttribute
+    {
-        RedirectionTargetAttribute,
-    };
     /** Constructs network-reply of the passed @a type for the passed @a url and @a requestHeaders. */
     UINetworkReply(UINetworkRequestType type, const QUrl &url, const UserDictionary &requestHeaders);
 …
     /** Returns value for the cached reply header of the passed @a type. */
     QVariant header(UINetworkReply::KnownHeader header) const;
-    /** Returns value for the cached reply attribute of the passed @a code. */
-    QVariant attribute(UINetworkReply::KnownAttribute code) const;
 private:

-              r69551
+              r70785
     else if (m_pReply->error() == UINetworkReply::NoError)
+    {
+        /* Check if redirection required: */
+        QUrl redirect = m_pReply->attribute(UINetworkReply::RedirectionTargetAttribute).toUrl();
+        if (redirect.isValid())
+        {
+            /* Cleanup current network-reply first: */
+            cleanupNetworkReply();
+            /* Choose redirect-source as current url: */
+            m_url = redirect;
+            /* Create new network-reply finally: */
+            prepareNetworkReply();
+        }
+        else
+        {
+            /* Notify own network-request listeners: */
+            emit sigFinished();
+            /* Notify common network-request listeners: */
+            emit sigFinished(m_uuid);
+        }
+    }
+    /* If some error occured: */
+        /* Notify own network-request listeners: */
+        emit sigFinished();
+        /* Notify common network-request listeners: */
+        emit sigFinished(m_uuid);
+    }
+    /* If some other error occured: */
     else
+    {

Note: See TracChangeset for help on using the changeset viewer.