Changeset 87029 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Dec 2, 2020 8:28:43 AM (4 years ago)

Author:

vboxsync

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

141653

Message:

Shared Clipboard/Transfers: A bit of cleanup. bugref:9874

File:

• trunk/src/VBox/Runtime/r3/http-server.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/http-server.cpp

@@ -437 +437 @@
     RT_NOREF(pClient);
 
-#ifdef LOGGING_ENABLED
+#ifdef LOG_ENABLED
     if (!pszData) /* Nothing to log? Bail out. */
         return;
@@ -478 +478 @@
  * @param   pClient             Client to reply to.
  * @param   enmSts              Status code to send.
- * @param   pHdrLst             Header list to send. Optional and can be NULL.
- */
-static int rtHttpServerSendResponseHdrEx(PRTHTTPSERVERCLIENT pClient,
-                                         RTHTTPSTATUS enmSts, PRTHTTPHEADERLIST pHdrLst)
-{
-    char *pszHdr;
-    int rc = RTStrAPrintf(&pszHdr,
+ */
+static int rtHttpServerSendResponse(PRTHTTPSERVERCLIENT pClient, RTHTTPSTATUS enmSts)
+{
+    char *pszResp;
+    int rc = RTStrAPrintf(&pszResp,
                           "%s %RU32 %s\r\n", RTHTTPVER_1_1_STR, enmSts, RTHttpStatusToStr(enmSts));
     AssertRCReturn(rc, rc);
-
+    rc = rtHttpServerWriteProto(pClient, pszResp);
+    RTStrFree(pszResp);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/**
+ * Main function for sending response headers back to the client.
+ *
+ * @returns VBox status code.
+ * @param   pClient             Client to reply to.
+ * @param   pHdrLst             Header list to send. Optional and can be NULL.
+ */
+static int rtHttpServerSendResponseHdrEx(PRTHTTPSERVERCLIENT pClient, PRTHTTPHEADERLIST pHdrLst)
+{
     RTHTTPHEADERLIST HdrLst;
-    rc = RTHttpHeaderListInit(&HdrLst);
+    int rc = RTHttpHeaderListInit(&HdrLst);
     AssertRCReturn(rc, rc);
 
@@ -505 +518 @@
     AssertRCReturn(rc, rc);
 
+    char *pszHdr = NULL;
+
     size_t i = 0;
     const char *pszEntry;
@@ -540 +555 @@
     RTHttpHeaderListDestroy(HdrLst);
 
-    LogFlowFunc(("enmStatus=%s, rc=%Rrc\n", RTHttpStatusToStr(enmSts), rc));
+    LogFlowFunc(("rc=%Rrc\n", rc));
     return rc;
 }
@@ -554 +569 @@
 static int rtHttpServerSendResponseEx(PRTHTTPSERVERCLIENT pClient, RTHTTPSTATUS enmSts, PRTHTTPHEADERLIST pHdrLst)
 {
-    int rc = rtHttpServerSendResponseHdrEx(pClient, enmSts, pHdrLst);
+    int rc = rtHttpServerSendResponse(pClient, enmSts);
+    if (RT_SUCCESS(rc))
+        rc = rtHttpServerSendResponseHdrEx(pClient, pHdrLst);
 
     return rc;