PR25548: CURLOPT_PATH_AS_IS backward compatibility

libcurl < 7.42 lacks the CURLOPT_PATH_AS_IS flag, but extraneous
client-side canonicalization is mostly harmless.

Signed-off-by: Frank Ch. Eigler <fche@redhat.com>
Reported-by: Mark Wielaard <mark@klomp.org>

diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog
index 7518e886031c59a3ce15df4e65dde0641251206b..60d912a37c477869d61e0164eca0e66dfba2a0f4 100644 (file)
--- a/debuginfod/ChangeLog
+++ b/debuginfod/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-26  Frank Ch. Eigler  <fche@redhat.com>
+
+       * debuginfod-client.c (debuginfod_query_server): Don't
+       set CURLOPT_PATH_AS_IS on old curl.  Mostly harmless.
+
 2020-03-24  Frank Ch. Eigler  <fche@redhat.com>
 
        * debuginfod-client.c (debuginfod_query_server): Set

diff --git a/debuginfod/debuginfod-client.c b/debuginfod/debuginfod-client.c
index 251047caf53f1415af01910e07071c06652361ed..f1b63160a5f291ef4deffcc7d5b09506ca031b8d 100644 (file)
--- a/debuginfod/debuginfod-client.c
+++ b/debuginfod/debuginfod-client.c
@@ -716,7 +716,12 @@ debuginfod_query_server (debuginfod_client *c,
       curl_easy_setopt(data[i].handle, CURLOPT_FOLLOWLOCATION, (long) 1);
       curl_easy_setopt(data[i].handle, CURLOPT_FAILONERROR, (long) 1);
       curl_easy_setopt(data[i].handle, CURLOPT_NOSIGNAL, (long) 1);
+#if CURL_AT_LEAST_VERSION(7,42,0)
       curl_easy_setopt(data[i].handle, CURLOPT_PATH_AS_IS, (long) 1);
+#else
+      /* On old curl; no big deal, canonicalization here is almost the
+         same, except perhaps for ? # type decorations at the tail. */
+#endif
       curl_easy_setopt(data[i].handle, CURLOPT_AUTOREFERER, (long) 1);
       curl_easy_setopt(data[i].handle, CURLOPT_ACCEPT_ENCODING, "");
       add_extra_headers(data[i].handle);