moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Jay Satiro 2019-03-18 16:33:58 -04:00
parent 27fb521df5
commit a375ab3be4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config-os400.h
View File

@ -425,8 +425,8 @@
/* Define if you can safely include both <sys/time.h> and <time.h>. */ /* Define if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME #define TIME_WITH_SYS_TIME
/* to enable alt-svc */ /* Define to enable alt-svc support (experimental) */
#define USE_ALTSVC 1 #undef USE_ALTSVC
/* Version number of package */ /* Version number of package */
#undef VERSION #undef VERSION

7
packages/OS400/ccsidcurl.c
View File

@ -1132,7 +1132,12 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if(testwarn) { if(testwarn) {
testwarn = 0; 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) (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1)
curl_mfprintf(stderr, curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");