moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 20:15:03 -05:00
Code Issues Releases Wiki Activity

Preparation of imminent release: synchronizing OS400 wrappers + RPG binding to current state.

Browse Source
This commit is contained in:
Patrick Monnerat 2009-02-16 15:33:17 +00:00
parent 8925527fef
commit 1472be4d3e
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/OS400/README.OS400
View File

@ -105,6 +105,7 @@ options:
CURLOPT_PASSWORD CURLOPT_PASSWORD
CURLOPT_PROXYUSERNAME CURLOPT_PROXYUSERNAME
CURLOPT_PROXYPASSWORD CURLOPT_PROXYPASSWORD
CURLOPT_NOPROXY
Else it is the same as for curl_easy_setopt(). Else it is the same as for curl_easy_setopt().
Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the
address of an (empty) character buffer, not the address of a string. address of an (empty) character buffer, not the address of a string.

5
packages/OS400/ccsidcurl.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2009, 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
@ -1030,7 +1030,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
if (testwarn) { if (testwarn) {
testwarn = 0; testwarn = 0;
if ((int) STRING_LAST != (int) STRING_PROXYPASSWORD + 1) if ((int) STRING_LAST != (int) STRING_NOPROXY + 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");
} }
@ -1079,6 +1079,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_PASSWORD: case CURLOPT_PASSWORD:
case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYUSERNAME:
case CURLOPT_PROXYPASSWORD: case CURLOPT_PROXYPASSWORD:
case CURLOPT_NOPROXY:
s = va_arg(arg, char *); s = va_arg(arg, char *);
ccsid = va_arg(arg, unsigned int); ccsid = va_arg(arg, unsigned int);

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

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2009, 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
@ -131,7 +131,7 @@
d c X'00000010' d c X'00000010'
d CURLAUTH_ANY c X'7FFFFFEF' d CURLAUTH_ANY c X'7FFFFFEF'
d CURLAUTH_ANYSAFE... d CURLAUTH_ANYSAFE...
d c X'7FFFFFEE' ~CURLAUTH_BASIC d c X'7FFFFFEE'
* *
d CURLSSH_AUTH_ANY... d CURLSSH_AUTH_ANY...
d c X'7FFFFFFF' d c X'7FFFFFFF'
@ -433,6 +433,8 @@
d curl_proxytype s 10i 0 based(######ptr######) Enum d curl_proxytype s 10i 0 based(######ptr######) Enum
d CURLPROXY_HTTP... d CURLPROXY_HTTP...
d c 0 d c 0
d CURLPROXY_HTTP_1_0...
d c 1
d CURLPROXY_SOCKS4... d CURLPROXY_SOCKS4...
d c 4 d c 4
d CURLPROXY_SOCKS5... d CURLPROXY_SOCKS5...
@ -792,6 +794,14 @@
d c 10175 d c 10175
d CURLOPT_PROXYPASSWORD... d CURLOPT_PROXYPASSWORD...
d c 10176 d c 10176
d CURLOPT_NOPROXY...
d c 10177
d CURLOPT_TFTP_BLKSIZE...
d c 00178
d CURLOPT_SOCKS5_GSSAPI_SERVICE...
d c 00179
d CURLOPT_SOCKS5_GSSAPI_NEC...
d c 00180
* *
d CURLOPT_POST301... d CURLOPT_POST301...
d c 00161 Obsolescent d c 00161 Obsolescent
@ -925,6 +935,8 @@
d c X'00300021' d c X'00300021'
d CURLINFO_CERTINFO... CURLINFO_SLIST + 34 d CURLINFO_CERTINFO... CURLINFO_SLIST + 34
d c X'00400022' d c X'00400022'
d CURLINFO_CONDITION_UNMET... CURLINFO_LONG + 35
d c X'00200023'
* *
d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE
d c X'00200002' d c X'00200002'

2
packages/OS400/initscript.sh
View File

@ -156,7 +156,7 @@ db2_name()
{ {
basename "${1}" | basename "${1}" |
tr '[a-z-]' '[A-Z_]' | tr '[a-z-]' '[A-Z_]' |
sed -e 's/\..*//' \ sed -e 's/\..*//' \
-e 's/^\(..........\).*/\1/' -e 's/^\(..........\).*/\1/'
} }

2
packages/OS400/make-lib.sh
View File

@ -13,7 +13,7 @@ cd "${TOPDIR}/lib"
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > os400.c
echo '#pragma comment(date)' >> os400.c echo '#pragma comment(date)' >> os400.c
echo '#pragma comment(copyright, "Copyright (C) 1998-2008 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c echo '#pragma comment(copyright, "Copyright (C) 1998-2009 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
make_module OS400 os400.c make_module OS400 os400.c
LINK= # No need to rebuild service program yet. LINK= # No need to rebuild service program yet.
MODULES= MODULES=