Changeset 99937 in vbox for trunk/src/VBox/Runtime

Timestamp:

May 23, 2023 3:38:52 PM (19 months ago)

Author:

vboxsync

Message:

Shared Clipboard: Added new testcase for the HTTP server in combination with the Shared Clipboard API, various updates and general improvements. bugref:9437

Location:

trunk/src/VBox/Runtime

Files:

• r3/http-server.cpp (modified) (12 diffs)
• tools/RTHttpServer.cpp (modified) (2 diffs)

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

@@ -794 +794 @@
             while (cbToRead)
             {
-                RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRead, pvHandle, pvBuf, RT_MIN(cbBuf, cbToRead), &cbRead);
+                RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRead, pReq, pvHandle, pvBuf, RT_MIN(cbBuf, cbToRead), &cbRead);
                 if (RT_FAILURE(rc))
                     break;
@@ -815 +815 @@
         int rc2 = rc; /* Save rc. */
 
-        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnClose, pvHandle);
+        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnClose, pReq, pvHandle);
 
         if (RT_FAILURE(rc2)) /* Restore original rc on failure. */
@@ -963 +963 @@
             while (cbToRead)
             {
-                RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRead, pvHandle, pvBuf, RT_MIN(cbBuf, cbToRead), &cbRead);
+                RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRead, pReq, pvHandle, pvBuf, RT_MIN(cbBuf, cbToRead), &cbRead);
                 if (RT_FAILURE(rc))
                     break;
@@ -985 +985 @@
         int rc2 = rc; /* Save rc. */
 
-        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnClose, pvHandle);
+        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnClose, pReq, pvHandle);
 
         if (RT_FAILURE(rc2)) /* Restore original rc on failure. */
@@ -1021 +1021 @@
                        || RTFS_IS_FILE(objInfo.Attr.fMode);
 
-            /* No symlinks and other stuff not allowed. */
+            /* No symlinks and other stuff allowed. */
         }
         else
@@ -1142 +1142 @@
         /*
          * Parse HTTP version to use.
-         * We're picky heree: Only HTTP 1.1 is supported by now.
+         * We're picky here: Only HTTP 1.1 is supported by now.
          */
         const char *pszVer = ppapszFirstLine[2];
@@ -1209 +1209 @@
         LogFlowFunc(("Request %s %s\n", RTHttpMethodToStr(pReq->enmMethod), pReq->pszUrl));
 
+        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRequestBegin, pReq);
+
         unsigned i = 0;
         for (; i < RT_ELEMENTS(g_aMethodMap); i++)
@@ -1225 +1227 @@
         }
 
+        RTHTTPSERVER_HANDLE_CALLBACK_VA(pfnRequestEnd, pReq);
+
         if (i == RT_ELEMENTS(g_aMethodMap))
             enmSts = RTHTTPSTATUS_NOTIMPLEMENTED;
@@ -1233 +1237 @@
         enmSts = RTHTTPSTATUS_BADREQUEST;
 
-    if (enmSts != RTHTTPSTATUS_INTERNAL_NOT_SET)
-    {
-        int rc2 = rtHttpServerSendResponseSimple(pClient, enmSts);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
+    /* Make sure to return at least *something* to the client, to prevent hangs. */
+    if (enmSts == RTHTTPSTATUS_INTERNAL_NOT_SET)
+        enmSts = RTHTTPSTATUS_INTERNALSERVERERROR;
+
+    int rc2 = rtHttpServerSendResponseSimple(pClient, enmSts);
+    if (RT_SUCCESS(rc))
+        rc = rc2;
 
     LogFlowFuncLeaveRC(rc);
@@ -1269 +1274 @@
         if (RT_FAILURE(rc))
         {
-            LogFlowFunc(("RTTcpSelectOne=%Rrc (cWaitMs=%RU64)\n", rc, cWaitMs));
+            Log2Func(("RTTcpSelectOne=%Rrc (cWaitMs=%RU64)\n", rc, cWaitMs));
             if (rc == VERR_TIMEOUT)
             {
@@ -1277 +1282 @@
                         tsLastReadMs = RTTimeMilliTS();
                     const uint64_t tsDeltaMs = pClient->State.msKeepAlive - (RTTimeMilliTS() - tsLastReadMs);
-                    LogFlowFunc(("tsLastReadMs=%RU64, tsDeltaMs=%RU64\n", tsLastReadMs, tsDeltaMs));
-                    Log3Func(("Keep alive active (%RU32ms): %RU64ms remaining\n", pClient->State.msKeepAlive, tsDeltaMs));
+                    Log2Func(("tsLastReadMs=%RU64, tsDeltaMs=%RU64\n", tsLastReadMs, tsDeltaMs));
+                    Log2Func(("Keep alive active (%RU32ms): %RU64ms remaining\n", pClient->State.msKeepAlive, tsDeltaMs));
                     if (   tsDeltaMs > cWaitMs
                         && tsDeltaMs < pClient->State.msKeepAlive)
@@ -1332 +1337 @@
         } while (cbToRead);
 
+        Log2Func(("Read client request done (%zu bytes) -> rc=%Rrc\n", cbReadTotal, rc));
+
         if (   RT_SUCCESS(rc)
             && cbReadTotal)
         {
-            LogFlowFunc(("Received client request (%zu bytes)\n", cbReadTotal));
-
             rtHttpServerLogProto(pClient, false /* fWrite */, szReq);
 

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

@@ -521 +521 @@
 }
 
-static DECLCALLBACK(int) onRead(PRTHTTPCALLBACKDATA pData, void *pvHandle, void *pvBuf, size_t cbBuf, size_t *pcbRead)
-{
+static DECLCALLBACK(int) onRead(PRTHTTPCALLBACKDATA pData,
+                                PRTHTTPSERVERREQ pReq, void *pvHandle, void *pvBuf, size_t cbBuf, size_t *pcbRead)
+{
+    RT_NOREF(pReq);
+
     PHTTPSERVERDATA pThis = (PHTTPSERVERDATA)pData->pvUser;
     Assert(pData->cbUser == sizeof(HTTPSERVERDATA));
@@ -554 +557 @@
 }
 
-static DECLCALLBACK(int) onClose(PRTHTTPCALLBACKDATA pData, void *pvHandle)
-{
+static DECLCALLBACK(int) onClose(PRTHTTPCALLBACKDATA pData, PRTHTTPSERVERREQ pReq, void *pvHandle)
+{
+    RT_NOREF(pReq);
+
     PHTTPSERVERDATA pThis = (PHTTPSERVERDATA)pData->pvUser;
     Assert(pData->cbUser == sizeof(HTTPSERVERDATA));