Changeset 74071 in vbox

Timestamp:

Sep 4, 2018 3:32:56 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/http: Fixed bug in rtHttpAddHeaderWorker where it failed to detected the frist header and tell cURL about it. bugref:9167

Location:

trunk/src/VBox/Runtime

Files:

• generic/http-curl.cpp (modified) (2 diffs)
• tools/RTHttp.cpp (modified) (3 diffs)

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

@@ -2041 +2041 @@
         if (!(fFlags & RTHTTPADDHDR_F_FRONT))
         {
+            bool const fDone = pThis->pHeaders != NULL;
+            ASMCompilerBarrier(); /* aliasing paranoia */
+
             *pThis->ppHeadersTail = &pHdr->Core;
             pThis->ppHeadersTail  = &pHdr->Core.next;
-            if (pThis->pHeaders != NULL)
+            if (fDone)
                 return rtHttpUpdateUserAgentHeader(pThis, pHdr);
 
@@ -2052 +2055 @@
             pHdr->Core.next = pThis->pHeaders;
             if (!pThis->pHeaders)
-                pThis->ppHeadersTail  = &pHdr->Core.next;
+                pThis->ppHeadersTail = &pHdr->Core.next;
         }
         pThis->pHeaders = &pHdr->Core;

trunk/src/VBox/Runtime/tools/RTHttp.cpp

@@ -32 +32 @@
 
 #include <iprt/assert.h>
+#include <iprt/ctype.h>
 #include <iprt/err.h>
 #include <iprt/getopt.h>
@@ -68 +69 @@
         { "--quiet",        'q', RTGETOPT_REQ_NOTHING },
         { "--verbose",      'v', RTGETOPT_REQ_NOTHING },
+        { "--set-header",   's', RTGETOPT_REQ_STRING },
     };
 
@@ -111 +113 @@
                 RTPrintf("$Revision$\n");
                 return RTEXITCODE_SUCCESS;
+
+            case 's':
+            {
+                char *pszColon = (char *)strchr(ValueUnion.psz, ':');
+                if (!pszColon)
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "No colon in --set-header value: %s", ValueUnion.psz);
+                *pszColon = '\0'; /* evil */
+                const char *pszValue = pszColon + 1;
+                if (RT_C_IS_BLANK(*pszValue))
+                    pszValue++;
+                int rc = RTHttpAddHeader(hHttp, ValueUnion.psz, pszValue, RTSTR_MAX, RTHTTPADDHDR_F_BACK);
+                *pszColon = ':';
+                if (RT_FAILURE(rc))
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTHttpAddHeader failed: %Rrc (on %s)", rc, ValueUnion.psz);
+                break;
+            }
 
             case VINF_GETOPT_NOT_OPTION: