Changeset 74250 in vbox for trunk/src/VBox/Runtime/generic/http-curl.cpp

Timestamp:

Sep 13, 2018 4:33:17 PM (6 years ago)

Author:

vboxsync

Message:

IRPT/rest,http: Use header callbacks for capturing header values in responses. Removed [P]FNCREATEINSTANCE as it isn't needed any more (and it didn't work like expected for RTCRestString). Some HTTP header callback updates. bugref:9167

File:

• trunk/src/VBox/Runtime/generic/http-curl.cpp (modified) (6 diffs)

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -3041 +3041 @@
     if (pThis->pfnHeaderCallback)
     {
-        /* Find the end of the field name first.  Since cURL gives us the
-           "HTTP/{version} {code} {status}" line too, we slap a fictitious
-           field name ':http-status-line' in front of it. */
+        /*
+         * Find the end of the field name first.
+         */
         uint32_t    uMatchWord;
         size_t      cchField;
@@ -3063 +3063 @@
             cchValue = cbToAppend - cchField - 1;
         }
-        else if (pchBuf[0] == 'H' && pchBuf[1] == 'T' && pchBuf[2] == 'T' && pchBuf[1] == 'P')
+        /* Since cURL gives us the "HTTP/{version} {code} {status}" line too,
+           we slap a fictitious field name ':http-status-line' in front of it. */
+        else if (cbToAppend > 5 && pchBuf[0] == 'H' && pchBuf[1] == 'T' && pchBuf[2] == 'T' && pchBuf[3] == 'P' && pchBuf[4] == '/')
         {
             pchField   = ":http-status-line";
@@ -3071 +3073 @@
             cchValue   = cbToAppend;
         }
+        /* cURL also gives us the empty line before the body, so we slap another
+           fictitious field name ':end-of-headers' in front of it as well. */
+        else if (cbToAppend == 2 && pchBuf[0] == '\r' && pchBuf[1] == '\n')
+        {
+            pchField   = ":end-of-headers";
+            cchField   = 15;
+            uMatchWord = RTHTTP_MAKE_HDR_MATCH_WORD(15, ':', 'e', 'n');
+            pchValue   = pchBuf;
+            cchValue   = cbToAppend;
+        }
         else
             AssertMsgFailedReturn(("pchBuf=%.*s\n", cbToAppend, pchBuf), cbToAppend);
 
-        /* Determin the field value, stripping one leading blank and all
-           trailing spaces. */
+        /*
+         * Determin the field value, stripping one leading blank and all
+         * trailing spaces.
+         */
         if (cchValue > 0 && RT_C_IS_BLANK(*pchValue))
             pchValue++, cchValue--;
@@ -3081 +3095 @@
             cchValue--;
 
-        /* Pass it to the callback. */
+        /*
+         * Pass it to the callback.
+         */
+        Log6(("rtHttpWriteHeaderData: %.*s: %.*s\n", cchField, pchBuf, cchValue, pchValue));
         int rc = pThis->pfnHeaderCallback(pThis, uMatchWord, pchBuf, cchField,
                                           pchValue, cchValue, pThis->pvHeaderCallbackUser);
@@ -3087 +3104 @@
             return cbToAppend;
 
+        /* Abort on error. */
         if (RT_SUCCESS(pThis->rcOutput))
             pThis->rcOutput = rc;
@@ -3547 +3565 @@
 
         /* Headers. */
-        if (ppvHeaders && CURL_SUCCESS(rcCurl))
+        if (CURL_SUCCESS(rcCurl))
         {
             RT_ZERO(pThis->HeadersOutput.uData.Mem);