Changeset 51733 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 26, 2014 9:20:40 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7418: Network Manager: Separate text/binary GET requests for UINetworkReply.

File:

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

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

@@ -73 +73 @@
     static int applyCertificates(RTHTTP pHttp, const QString &strFullCertificateFileName);
     static int applyRawHeaders(RTHTTP pHttp, const QList<QByteArray> &headers, const QNetworkRequest &request);
-    static int performGetRequest(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply);
+    static int performGetRequestForText(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply);
+    static int performGetRequestForBinary(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply);
     static int checkCertificates(RTHTTP pHttp, const QString &strFullCertificateFileName);
     static int downloadCertificates(RTHTTP pHttp, const QString &strFullCertificateFileName);
@@ -158 +159 @@
 {
     /* Perform GET request: */
-    return performGetRequest(m_pHttp, m_request, m_reply);
+    return performGetRequestForText(m_pHttp, m_request, m_reply);
 }
 
@@ -261 +262 @@
 
 /* static */
-int UINetworkReplyPrivateThread::performGetRequest(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply)
+int UINetworkReplyPrivateThread::performGetRequestForText(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply)
 {
     /* Make sure HTTP is created: */
@@ -268 +269 @@
 
     /* Perform blocking HTTP GET request: */
-    char *pszBuf = 0;
+    char *pszBuffer = 0;
     int rc = RTHttpGetText(pHttp,
                            request.url().toString().toAscii().constData(),
-                           &pszBuf);
-    reply = QByteArray(pszBuf);
-    RTMemFree(pszBuf);
+                           &pszBuffer);
+    reply = QByteArray(pszBuffer);
+    RTMemFree(pszBuffer);
+    return rc;
+}
+
+/* static */
+int UINetworkReplyPrivateThread::performGetRequestForBinary(RTHTTP pHttp, const QNetworkRequest &request, QByteArray &reply)
+{
+    /* Make sure HTTP is created: */
+    if (!pHttp)
+        return VERR_INVALID_POINTER;
+
+    /* Perform blocking HTTP GET request: */
+    void *pBuffer = 0;
+    size_t size = 0;
+    int rc = RTHttpGetBinary(pHttp,
+                             request.url().toString().toAscii().constData(),
+                             &pBuffer, &size);
+    reply = QByteArray((const char*)pBuffer, (int)size);
+    RTMemFree(pBuffer);
     return rc;
 }
@@ -363 +382 @@
     QByteArray certificate;
     const QNetworkRequest address(QUrl("http://www.verisign.com/repository/roots/root-certificates/PCA-3G5.pem"));
-    int rc = performGetRequest(pHttp, address, certificate);
+    int rc = performGetRequestForText(pHttp, address, certificate);
 
     /* Verify certificate: */
@@ -383 +402 @@
     QByteArray certificate;
     const QNetworkRequest address(QUrl("http://www.verisign.com/repository/roots/root-certificates/PCA-3.pem"));
-    int rc = performGetRequest(pHttp, address, certificate);
+    int rc = performGetRequestForText(pHttp, address, certificate);
 
     /* Verify certificate: */