Merge pull request #10661 from rouault/pathspecificoption_streaming

CPLHTTPGetOptionsFromEnv(): fallback to non-streaming filename with no path specific option has been found on the streaming one
OSGeo · Sep 7, 2024 · 5f3eb89 · 5f3eb89
2 parents ec02d42 + e4df9be
commit 5f3eb89
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 49 deletions.
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
@@ -1139,15 +1139,38 @@ def test_vsicurl_GDAL_HTTP_HEADERS(server):
     filename = (
         "/vsicurl/http://localhost:%d/test_vsicurl_GDAL_HTTP_HEADERS.bin" % server.port
     )
-    gdal.SetPathSpecificOption(
-        filename,
-        "GDAL_HTTP_HEADERS",
-        r'Foo: Bar,"Baz: escaped backslash \\, escaped double-quote \", end of value",Another: Header',
-    )
-    with webserver.install_http_handler(handler):
-        statres = gdal.VSIStatL(filename)
-    gdal.SetPathSpecificOption(filename, "GDAL_HTTP_HEADERS", None)
-    assert statres.size == 3
+    try:
+        gdal.SetPathSpecificOption(
+            filename,
+            "GDAL_HTTP_HEADERS",
+            r'Foo: Bar,"Baz: escaped backslash \\, escaped double-quote \", end of value",Another: Header',
+        )
+        with webserver.install_http_handler(handler):
+            statres = gdal.VSIStatL(filename)
+        assert statres.size == 3
+
+        gdal.VSICurlClearCache()
+        handler = webserver.SequentialHandler()
+        handler.add(
+            "HEAD",
+            "/test_vsicurl_GDAL_HTTP_HEADERS.bin",
+            200,
+            {"Content-Length": "3"},
+            expected_headers={
+                "Foo": "Bar",
+                "Baz": r'escaped backslash \, escaped double-quote ", end of value',
+                "Another": "Header",
+            },
+        )
+        with webserver.install_http_handler(handler):
+            statres = gdal.VSIStatL(
+                "/vsicurl_streaming/http://localhost:%d/test_vsicurl_GDAL_HTTP_HEADERS.bin"
+                % server.port
+            )
+        assert statres.size == 3
+
+    finally:
+        gdal.SetPathSpecificOption(filename, "GDAL_HTTP_HEADERS", None)
 
 
 ###############################################################################

diff --git a/port/cpl_http.cpp b/port/cpl_http.cpp
@@ -43,6 +43,7 @@
 #include "cpl_http.h"
 #include "cpl_error.h"
 #include "cpl_multiproc.h"
+#include "cpl_vsi_virtual.h"
 #include "cpl_vsil_curl_class.h"
 
 // gcc or clang complains about C-style cast in #define like
@@ -554,13 +555,40 @@ constexpr TupleEnvVarOptionName asAssocEnvVarOptionName[] = {
 char **CPLHTTPGetOptionsFromEnv(const char *pszFilename)
 {
     CPLStringList aosOptions;
+    std::string osNonStreamingFilename;
+    if (STARTS_WITH(pszFilename, "/vsi"))
+    {
+        VSIFilesystemHandler *poFSHandler =
+            VSIFileManager::GetHandler(pszFilename);
+        osNonStreamingFilename =
+            poFSHandler->GetNonStreamingFilename(pszFilename);
+        if (osNonStreamingFilename == pszFilename)
+        {
+            osNonStreamingFilename.clear();
+        }
+        else
+        {
+            // CPLDebug("HTTP", "Non-streaming filename for %s: %s", pszFilename, osNonStreamingFilename.c_str());
+        }
+    }
     for (const auto &sTuple : asAssocEnvVarOptionName)
     {
-        const char *pszVal =
-            pszFilename ? VSIGetPathSpecificOption(pszFilename,
-                                                   sTuple.pszEnvVar, nullptr)
-                        : CPLGetConfigOption(sTuple.pszEnvVar, nullptr);
-        if (pszVal != nullptr)
+        const char *pszVal = nullptr;
+        if (pszFilename)
+        {
+            pszVal = VSIGetPathSpecificOption(pszFilename, sTuple.pszEnvVar,
+                                              nullptr);
+            if (!pszVal && !osNonStreamingFilename.empty())
+            {
+                pszVal = VSIGetPathSpecificOption(
+                    osNonStreamingFilename.c_str(), sTuple.pszEnvVar, nullptr);
+            }
+        }
+        if (!pszVal)
+        {
+            pszVal = CPLGetConfigOption(sTuple.pszEnvVar, nullptr);
+        }
+        if (pszVal)
         {
             aosOptions.AddNameValue(sTuple.pszOptionName, pszVal);
         }

diff --git a/port/cpl_vsi_virtual.h b/port/cpl_vsi_virtual.h
@@ -341,6 +341,12 @@ class CPL_DLL VSIFilesystemHandler
         return osFilename;
     }
 
+    virtual std::string
+    GetNonStreamingFilename(const std::string &osFilename) const
+    {
+        return osFilename;
+    }
+
     /** Return the canonical filename.
      *
      * May be implemented by case-insensitive filesystems