diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2019-03-18 16:33:58 -0400 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2019-03-24 16:43:43 -0400 |
| commit | a375ab3be458c1aed126efc9739cf4d6eae9d59b (patch) | |
| tree | 116bd298f3dd0c66deab3496903000381fa55660 | |
| parent | 27fb521df567ae1b26fb07b42d393136eed90c14 (diff) | |
| download | gnurl-a375ab3be458c1aed126efc9739cf4d6eae9d59b.tar.gz gnurl-a375ab3be458c1aed126efc9739cf4d6eae9d59b.tar.bz2 gnurl-a375ab3be458c1aed126efc9739cf4d6eae9d59b.zip | |
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
| -rw-r--r-- | lib/config-os400.h | 4 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 7 |
2 files changed, 8 insertions, 3 deletions
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"); |