Changeset 100669 in vbox for trunk

Timestamp:

Jul 20, 2023 2:58:53 PM (19 months ago)

Author:

vboxsync

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

158509

Message:

IPRT/http-server: Only return a client response in rtHttpServerProcessRequest() if a handler method hasn't been called. Otherwise the handler is in charge of doing so. bugref:9437

File:

• trunk/src/VBox/Runtime/r3/http-server.cpp (modified) (1 diff)

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

@@ -1240 +1240 @@
         enmSts = RTHTTPSTATUS_BADREQUEST;
 
-    /* Make sure to return at least *something* to the client, to prevent hangs. */
-    if (enmSts == RTHTTPSTATUS_INTERNAL_NOT_SET)
-        enmSts = rtHttpServerRcToStatus(VERR_INTERNAL_ERROR);
-
-    int rc2 = rtHttpServerSendResponseSimple(pClient, enmSts);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
+    /* If a status was set here explicitly, return it to prevent client hangs. */
+    if (enmSts != RTHTTPSTATUS_INTERNAL_NOT_SET)
+    {
+        int rc2 = rtHttpServerSendResponseSimple(pClient, enmSts);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
 
     LogFlowFuncLeaveRC(rc);