Changeset 87037 in vbox

Timestamp:

Dec 3, 2020 4:14:04 PM (4 years ago)

Author:

vboxsync

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

141698

Message:

Shared Clipboard/Transfers: Renaming (RTHTTP_WITH_WEBDAV -> IPRT_HTTP_WITH_WEBDAV). bugref:9874

Location:

trunk

Files:

• include/iprt/http-common.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/generic/http-curl.cpp (modified) (2 diffs)
• src/VBox/Runtime/generic/http.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/http-server.cpp (modified) (7 diffs)
• src/VBox/Runtime/tools/Makefile.kmk (modified) (1 diff)
• src/VBox/Runtime/tools/RTHttpServer.cpp (modified) (8 diffs)

trunk/include/iprt/http-common.h

@@ -48 +48 @@
     RTHTTPMETHOD_OPTIONS,
     RTHTTPMETHOD_TRACE,
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
     RTHTTPMETHOD_PROPFIND,
 #endif

trunk/src/VBox/Runtime/Makefile.kmk

@@ -307 +307 @@
 ifdef IPRT_WITH_FUTEX_BASED_SEMS
  RuntimeR3_DEFS.linux  += IPRT_WITH_FUTEX_BASED_SEMS
+endif
+ifdef IPRT_HTTP_WITH_WEBDAV
+ RuntimeR3_DEFS        += IPRT_HTTP_WITH_WEBDAV
 endif
 RuntimeR3_INCS          = \

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

@@ -2396 +2396 @@
         case RTHTTPMETHOD_OPTIONS:  pszMethodSp = "options "; break;
         case RTHTTPMETHOD_TRACE:    pszMethodSp = "trace "; break;
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
         case RTHTTPMETHOD_PROPFIND: pszMethodSp = "propfind "; break;
 #endif
@@ -3737 +3737 @@
                 rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_CUSTOMREQUEST, "TRACE");
                 break;
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
             case RTHTTPMETHOD_PROPFIND:
                 RT_FALL_THROUGH();

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

@@ -104 +104 @@
         case RTHTTPMETHOD_OPTIONS:  return "OPTIONS";
         case RTHTTPMETHOD_TRACE:    return "TRACE";
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
         case RTHTTPMETHOD_PROPFIND: return "PROPFIND";
 #endif

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

@@ -15 +15 @@
  * - No multi-threading.
  *
- * For WebDAV (optional via RTHTTP_WITH_WEBDAV):
+ * For WebDAV (optional via IPRT_HTTP_WITH_WEBDAV):
  * - Only OPTIONS + PROPLIST methods are implemented (e.g. simple read-only support).
  * - No pagination support for directory listings.
@@ -258 +258 @@
 static FNRTHTTPSERVERMETHOD  rtHttpServerHandleGET;
 static FNRTHTTPSERVERMETHOD  rtHttpServerHandleHEAD;
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
  static FNRTHTTPSERVERMETHOD rtHttpServerHandleOPTIONS;
  static FNRTHTTPSERVERMETHOD rtHttpServerHandlePROPFIND;
@@ -289 +289 @@
     { RTHTTPMETHOD_GET,      rtHttpServerHandleGET },
     { RTHTTPMETHOD_HEAD,     rtHttpServerHandleHEAD },
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
     { RTHTTPMETHOD_OPTIONS,  rtHttpServerHandleOPTIONS },
     { RTHTTPMETHOD_PROPFIND, rtHttpServerHandlePROPFIND },
@@ -526 +526 @@
     AssertRCReturn(rc, rc);
 
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
     rc = RTHttpHeaderListAdd(HdrLst, "Allow", "GET, HEAD, PROPFIND", strlen("GET, HEAD, PROPFIND"), RTHTTPHEADERLISTADD_F_BACK);
     AssertRCReturn(rc, rc);
@@ -820 +820 @@
 }
 
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
 /**
  * Handler for the OPTIONS method.
@@ -932 +932 @@
     return rc;
 }
-#endif /* RTHTTP_WITH_WEBDAV */
+#endif /* IPRT_HTTP_WITH_WEBDAV */
 
 /**
@@ -1042 +1042 @@
     if      (!RTStrCmp(pszReq, "GET"))      pReq->enmMethod = RTHTTPMETHOD_GET;
     else if (!RTStrCmp(pszReq, "HEAD"))     pReq->enmMethod = RTHTTPMETHOD_HEAD;
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
     else if (!RTStrCmp(pszReq, "OPTIONS"))  pReq->enmMethod = RTHTTPMETHOD_OPTIONS;
     else if (!RTStrCmp(pszReq, "PROPFIND")) pReq->enmMethod = RTHTTPMETHOD_PROPFIND;

trunk/src/VBox/Runtime/tools/Makefile.kmk

@@ -162 +162 @@
  RTHttpServer_TEMPLATE = VBoxR3Tool
  RTHttpServer_SOURCES = RTHttpServer.cpp
+ ifdef IPRT_HTTP_WITH_WEBDAV
+  RTHttpServer_DEFS   += IPRT_HTTP_WITH_WEBDAV
+ endif
 
  # RTLdrCheckImports - import checker.

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

@@ -311 +311 @@
 }
 
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
 static int dirEntryWriteDAV(char *pszBuf, size_t cbBuf,
                             const char *pszEntry, const PRTFSOBJINFO pObjInfo, size_t *pcbWritten)
@@ -354 +354 @@
     return rc;
 }
-#endif /* RTHTTP_WITH_WEBDAV */
+#endif /* IPRT_HTTP_WITH_WEBDAV */
 
 static int dirEntryWrite(RTHTTPMETHOD enmMethod, char *pszBuf, size_t cbBuf,
@@ -376 +376 @@
             rc = VERR_BUFFER_OVERFLOW;
     }
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
     else if (enmMethod == RTHTTPMETHOD_PROPFIND)
     {
@@ -385 +385 @@
         AssertRC(rc);
     }
-#endif /* RTHTTP_WITH_WEBDAV */
+#endif /* IPRT_HTTP_WITH_WEBDAV */
     else
         rc = VERR_NOT_SUPPORTED;
@@ -570 +570 @@
                         cbBodyLeft -= cch;
                     }
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
                     else if (pReq->enmMethod == RTHTTPMETHOD_PROPFIND)
                     {
@@ -588 +588 @@
                         cbBodyLeft -= cch;
                     }
-#endif /* RTHTTP_WITH_WEBDAV */
+#endif /* IPRT_HTTP_WITH_WEBDAV */
                     /*
                      * Write body entries.
@@ -639 +639 @@
                                 rc = RTStrAPrintf(ppszMIMEHint, "text/plain");
                         }
-#ifdef RTHTTP_WITH_WEBDAV
+#ifdef IPRT_HTTP_WITH_WEBDAV
                         else if (pReq->enmMethod == RTHTTPMETHOD_PROPFIND)
                         {
@@ -650 +650 @@
                             RT_NOREF(cch);
                         }
-#endif /* RTHTTP_WITH_WEBDAV */
+#endif /* IPRT_HTTP_WITH_WEBDAV */
 
                         pResp->cbBodyUsed = strlen((char *)pResp->pvBody);