diff options
| author | Patrick Monnerat <pm@datasphere.ch> | 2015-05-05 14:05:41 +0200 |
|---|---|---|
| committer | Patrick Monnerat <pm@datasphere.ch> | 2015-05-05 14:05:41 +0200 |
| commit | 9fcc297ff30a265c31747d440c5262ac3ffa0020 (patch) | |
| tree | 533818f7261cf830f29a70ea7c2208a6c53a68fd /packages/OS400 | |
| parent | 8a35211f3e728ffeb87b7bf7588b896a24332a79 (diff) | |
OS400: Add SPNEGO service name options to ILE/RPG binding.
Diffstat (limited to 'packages/OS400')
| -rw-r--r-- | packages/OS400/README.OS400 | 2 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 6 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 99b606c89..0cb1cf294 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -93,12 +93,14 @@ options: CURLOPT_PROXYPASSWORD CURLOPT_PROXYUSERNAME CURLOPT_PROXYUSERPWD + CURLOPT_PROXY_SERVICE_NAME CURLOPT_RANDOM_FILE CURLOPT_RANGE CURLOPT_REFERER CURLOPT_RTSP_SESSION_UID CURLOPT_RTSP_STREAM_URI CURLOPT_RTSP_TRANSPORT + CURLOPT_SERVICE_NAME CURLOPT_SOCKS5_GSSAPI_SERVICE CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 Note: SSH not available on OS400. CURLOPT_SSH_KNOWNHOSTS Note: SSH not available on OS400. diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index ca3b0f1ad..a903fe34a 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, 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 @@ -1154,12 +1154,14 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_PROXYPASSWORD: case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYUSERPWD: + case CURLOPT_PROXY_SERVICE_NAME: case CURLOPT_RANDOM_FILE: case CURLOPT_RANGE: case CURLOPT_REFERER: case CURLOPT_RTSP_SESSION_ID: case CURLOPT_RTSP_STREAM_URI: case CURLOPT_RTSP_TRANSPORT: + case CURLOPT_SERVICE_NAME: case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: case CURLOPT_SSH_KNOWNHOSTS: @@ -1180,8 +1182,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_USERNAME: case CURLOPT_USERPWD: case CURLOPT_XOAUTH2_BEARER: - case CURLOPT_PROXY_SERVICE_NAME: - case CURLOPT_SERVICE_NAME: s = va_arg(arg, char *); ccsid = va_arg(arg, unsigned int); diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 32c0d7f2f..2bbf6b0ff 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2015, 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 @@ -1211,6 +1211,10 @@ d c 00233 d CURLOPT_PATH_AS_IS... d c 00234 + d CURLOPT_PROXY_SERVICE_NAME... + d c 10235 + d CURLOPT_SERVICE_NAME... + d c 10236 * /if not defined(CURL_NO_OLDIES) d CURLOPT_FILE c 10001 |