From: Jay Satiro <raysatiro@yahoo.com>
Date: Mon, 18 Mar 2019 20:33:58 +0000 (-0400)
Subject: os400: Disable Alt-Svc by default since it's experimental
X-Git-Tag: curl-7_64_1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a375ab3be458c1aed126efc9739cf4d6eae9d59b;p=curl

os400: Disable Alt-Svc by default since it's experimental

Follow-up to 520f0b4 which added Alt-Svc support and enabled it by
default for OS400. Since the feature is experimental, it should be
disabled by default.

Ref: https://github.com/curl/curl/commit/520f0b4#commitcomment-32792332
Ref: https://curl.haxx.se/mail/lib-2019-02/0008.html

Closes https://github.com/curl/curl/pull/3688
---

diff --git a/lib/config-os400.h b/lib/config-os400.h
index d2cb1caff..bde4f0b33 100644
--- a/lib/config-os400.h
+++ b/lib/config-os400.h
@@ -425,8 +425,8 @@
 /* Define if you can safely include both <sys/time.h> and <time.h>. */
 #define TIME_WITH_SYS_TIME
 
-/* to enable alt-svc */
-#define USE_ALTSVC 1
+/* Define to enable alt-svc support (experimental) */
+#undef USE_ALTSVC
 
 /* Version number of package */
 #undef VERSION
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index eae2c5751..a4cae27ee 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1132,7 +1132,12 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   if(testwarn) {
     testwarn = 0;
 
-    if((int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 ||
+    if(
+#ifdef USE_ALTSVC
+       (int) STRING_LASTZEROTERMINATED != (int) STRING_ALTSVC + 1 ||
+#else
+       (int) STRING_LASTZEROTERMINATED != (int) STRING_DOH + 1 ||
+#endif
        (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)
       curl_mfprintf(stderr,
        "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");