Changeset 100670 in vbox for trunk/src/VBox/Runtime/r3/http-server.cpp

Timestamp:

Jul 20, 2023 4:38:22 PM (19 months ago)

Author:

vboxsync

Message:

IPRT/http-server: Relaxed debug assertions in rtHttpServerHandleGET() a bit, so that those won't get triggered when being used with GVFS. bugref:9437

File:

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

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

@@ -803 +803 @@
                 break;
             rc = rtHttpServerSendResponseBody(pClient, pvBuf, cbRead, &cbWritten);
+            if (RT_FAILURE(rc))
+                break;
             AssertBreak(cbToRead >= cbWritten);
             cbToRead -= cbWritten;
-            if (rc == VERR_NET_CONNECTION_RESET_BY_PEER) /* Clients often apruptly abort the connection when done. */
-            {
-                rc = VINF_SUCCESS;
-                break;
-            }
-            AssertRCBreak(rc);
+#if 0 /* Disabled, VERR_BROKEN_PIPE happens too often with GVFS 1.50. */
+            AssertMsgRCBreak(rc, ("rc=%Rrc, cbRead=%zu, cbToRead=%zu, cbWritten=%zu\n", rc, cbRead, cbToRead, cbWritten));
+#endif
         }
 
         break;
     } /* for (;;) */
+
+    if (rc == VERR_NET_CONNECTION_RESET_BY_PEER) /* Clients often apruptly abort the connection when done. */
+        rc = VINF_SUCCESS;
 
     RTMemFree(pvBuf);