generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OS400: Add SPNEGO service name options to ILE/RPG binding.

Browse Source
This commit is contained in:
Patrick Monnerat 2015-05-05 14:05:41 +02:00
parent 8a35211f3e
commit 9fcc297ff3
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/OS400/README.OS400
View File

@ -93,12 +93,14 @@ options:
CURLOPT_PROXYPASSWORD CURLOPT_PROXYPASSWORD
CURLOPT_PROXYUSERNAME CURLOPT_PROXYUSERNAME
CURLOPT_PROXYUSERPWD CURLOPT_PROXYUSERPWD
CURLOPT_PROXY_SERVICE_NAME
CURLOPT_RANDOM_FILE CURLOPT_RANDOM_FILE
CURLOPT_RANGE CURLOPT_RANGE
CURLOPT_REFERER CURLOPT_REFERER
CURLOPT_RTSP_SESSION_UID CURLOPT_RTSP_SESSION_UID
CURLOPT_RTSP_STREAM_URI CURLOPT_RTSP_STREAM_URI
CURLOPT_RTSP_TRANSPORT CURLOPT_RTSP_TRANSPORT
CURLOPT_SERVICE_NAME
CURLOPT_SOCKS5_GSSAPI_SERVICE CURLOPT_SOCKS5_GSSAPI_SERVICE
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 Note: SSH not available on OS400. CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 Note: SSH not available on OS400.
CURLOPT_SSH_KNOWNHOSTS Note: SSH not available on OS400. CURLOPT_SSH_KNOWNHOSTS Note: SSH not available on OS400.

6
packages/OS400/ccsidcurl.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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_PROXYPASSWORD:
case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYUSERNAME:
case CURLOPT_PROXYUSERPWD: case CURLOPT_PROXYUSERPWD:
case CURLOPT_PROXY_SERVICE_NAME:
case CURLOPT_RANDOM_FILE: case CURLOPT_RANDOM_FILE:
case CURLOPT_RANGE: case CURLOPT_RANGE:
case CURLOPT_REFERER: case CURLOPT_REFERER:
case CURLOPT_RTSP_SESSION_ID: case CURLOPT_RTSP_SESSION_ID:
case CURLOPT_RTSP_STREAM_URI: case CURLOPT_RTSP_STREAM_URI:
case CURLOPT_RTSP_TRANSPORT: case CURLOPT_RTSP_TRANSPORT:
case CURLOPT_SERVICE_NAME:
case CURLOPT_SOCKS5_GSSAPI_SERVICE: case CURLOPT_SOCKS5_GSSAPI_SERVICE:
case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:
case CURLOPT_SSH_KNOWNHOSTS: case CURLOPT_SSH_KNOWNHOSTS:
@ -1180,8 +1182,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_USERNAME: case CURLOPT_USERNAME:
case CURLOPT_USERPWD: case CURLOPT_USERPWD:
case CURLOPT_XOAUTH2_BEARER: case CURLOPT_XOAUTH2_BEARER:
case CURLOPT_PROXY_SERVICE_NAME:
case CURLOPT_SERVICE_NAME:
s = va_arg(arg, char *); s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int); ccsid = va_arg(arg, unsigned int);

6
packages/OS400/curl.inc.in
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -1211,6 +1211,10 @@
d c 00233 d c 00233
d CURLOPT_PATH_AS_IS... d CURLOPT_PATH_AS_IS...
d c 00234 d c 00234
d CURLOPT_PROXY_SERVICE_NAME...
d c 10235
d CURLOPT_SERVICE_NAME...
d c 10236
* *
/if not defined(CURL_NO_OLDIES) /if not defined(CURL_NO_OLDIES)
d CURLOPT_FILE c 10001 d CURLOPT_FILE c 10001