Changeset 75108 in vbox

Timestamp:

Oct 26, 2018 3:44:26 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126171

Message:

IPRT/http: Extended RTHttpReset with a flag parameter so headers can be kept. bugref:9167

Location:

trunk

Files:

• include/iprt/http.h (modified) (1 diff)
• src/VBox/Runtime/common/rest/RTCRestClientApiBase.cpp (modified) (1 diff)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (1 diff)

trunk/include/iprt/http.h

@@ -58 +58 @@
  *
  * @returns IPRT status code.
- * @param   hHttp      Handle to the HTTP interface.
- */
-RTR3DECL(int) RTHttpReset(RTHTTP hHttp);
+ * @param   hHttp       Handle to the HTTP interface.
+ * @param   fFlags      Flags, RTHTTP_RESET_F_XXX.
+ */
+RTR3DECL(int) RTHttpReset(RTHTTP hHttp, uint32_t fFlags);
+
+/** @name RTHTTP_RESET_F_XXX - Flags for RTHttpReset.
+ * @{ */
+/** Keep the headers. */
+#define RTHTTP_RESET_F_KEEP_HEADERS     RT_BIT_32(0)
+/** Mask containing the valid flags. */
+#define RTHTTP_RESET_F_VALID_MASK       UINT32_C(0x00000001)
+/** @} */
+
 
 /**

trunk/src/VBox/Runtime/common/rest/RTCRestClientApiBase.cpp

@@ -178 +178 @@
     {
 #if 0   /** @todo XXX: disable for now as it causes the RTHTTP handle state and curl state to get out of sync. */
-        return RTHttpReset(m_hHttp);
+        return RTHttpDestroy(m_hHttp, 0 /*fFlags*/);
 #else
         RTHttpDestroy(m_hHttp);

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

@@ -406 +406 @@
 
 
-RTR3DECL(int) RTHttpReset(RTHTTP hHttp)
-{
-    if (hHttp == NIL_RTHTTP)
-        return VERR_INVALID_HANDLE;
-
+RTR3DECL(int) RTHttpReset(RTHTTP hHttp, uint32_t fFlags)
+{
+    /* Validate the instance handle, state and flags. */
     PRTHTTPINTERNAL pThis = hHttp;
     RTHTTP_VALID_RETURN(pThis);
-
     AssertReturn(!pThis->fBusy, VERR_WRONG_ORDER);
+    AssertReturn(!(fFlags & ~RTHTTP_RESET_F_VALID_MASK), VERR_INVALID_FLAGS);
 
     /* This resets options, but keeps open connections, cookies, etc. */
     curl_easy_reset(pThis->pCurl);
 
-    rtHttpFreeHeaders(pThis);
+    if (!(fFlags & RTHTTP_RESET_F_KEEP_HEADERS))
+        rtHttpFreeHeaders(pThis);
 
     pThis->uDownloadHttpStatus      = UINT32_MAX;