diff options
author | Patrick Monnerat <patrick@monnerat.net> | 2018-01-13 01:20:40 +0100 |
---|---|---|
committer | Patrick Monnerat <patrick@monnerat.net> | 2018-01-13 01:28:19 +0100 |
commit | 3b548ffde9f0ea85dd320ae6af23a2e3fdbb6d29 (patch) | |
tree | feb740bc67a87e444e4212fbdbf505db0e486dae /packages/OS400/ccsidcurl.c | |
parent | fa3dbb9a147488a2943bda809c66fc497efe06cb (diff) |
setopt: reintroduce non-static Curl_vsetopt() for OS400 support
This also upgrades ILE/RPG bindings with latest setopt options.
Reported-By: jonrumsey on github
Fixes #2230
Closes #2233
Diffstat (limited to 'packages/OS400/ccsidcurl.c')
-rw-r--r-- | packages/OS400/ccsidcurl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index de2c9cc01..0ca6d6866 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,6 +36,7 @@ #include "slist.h" #include "urldata.h" #include "url.h" +#include "setopt.h" #include "getinfo.h" #include "ccsidcurl.h" @@ -1124,7 +1125,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) if(testwarn) { testwarn = 0; - if((int) STRING_LASTZEROTERMINATED != (int) STRING_UNIX_SOCKET_PATH + 1 || + if((int) STRING_LASTZEROTERMINATED != (int) STRING_TARGET + 1 || (int) STRING_LAST != (int) STRING_COPYPOSTFIELDS + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); @@ -1184,6 +1185,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_RANDOM_FILE: case CURLOPT_RANGE: case CURLOPT_REFERER: + case CURLOPT_REQUEST_TARGET: case CURLOPT_RTSP_SESSION_ID: case CURLOPT_RTSP_STREAM_URI: case CURLOPT_RTSP_TRANSPORT: @@ -1287,7 +1289,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_ERRORBUFFER: /* This is an output buffer. */ default: - result = Curl_setopt(data, tag, arg); + result = Curl_vsetopt(data, tag, arg); break; } |