aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/OS400/README.OS4001
-rw-r--r--packages/OS400/ccsidcurl.c5
-rw-r--r--packages/OS400/curl.inc.in16
-rw-r--r--packages/OS400/initscript.sh2
-rw-r--r--packages/OS400/make-lib.sh2
5 files changed, 20 insertions, 6 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 9e25a10a0..7f78292a2 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -105,6 +105,7 @@ options:
CURLOPT_PASSWORD
CURLOPT_PROXYUSERNAME
CURLOPT_PROXYPASSWORD
+ CURLOPT_NOPROXY
Else it is the same as for curl_easy_setopt().
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.
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 88aa9c08d..1591978a5 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -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
* 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) {
testwarn = 0;
- if ((int) STRING_LAST != (int) STRING_PROXYPASSWORD + 1)
+ if ((int) STRING_LAST != (int) STRING_NOPROXY + 1)
curl_mfprintf(stderr,
"*** 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_PROXYUSERNAME:
case CURLOPT_PROXYPASSWORD:
+ case CURLOPT_NOPROXY:
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 84804ac9d..30b044bcb 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -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
* you should have received as part of this distribution. The terms
@@ -131,7 +131,7 @@
d c X'00000010'
d CURLAUTH_ANY c X'7FFFFFEF'
d CURLAUTH_ANYSAFE...
- d c X'7FFFFFEE' ~CURLAUTH_BASIC
+ d c X'7FFFFFEE'
*
d CURLSSH_AUTH_ANY...
d c X'7FFFFFFF'
@@ -433,6 +433,8 @@
d curl_proxytype s 10i 0 based(######ptr######) Enum
d CURLPROXY_HTTP...
d c 0
+ d CURLPROXY_HTTP_1_0...
+ d c 1
d CURLPROXY_SOCKS4...
d c 4
d CURLPROXY_SOCKS5...
@@ -792,6 +794,14 @@
d c 10175
d CURLOPT_PROXYPASSWORD...
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 c 00161 Obsolescent
@@ -925,6 +935,8 @@
d c X'00300021'
d CURLINFO_CERTINFO... CURLINFO_SLIST + 34
d c X'00400022'
+ d CURLINFO_CONDITION_UNMET... CURLINFO_LONG + 35
+ d c X'00200023'
*
d CURLINFO_HTTP_CODE... Old ...RESPONSE_CODE
d c X'00200002'
diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index 308c6d72b..15ae86ea5 100644
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -156,7 +156,7 @@ db2_name()
{
basename "${1}" |
- tr '[a-z-]' '[A-Z_]' |
+ tr '[a-z-]' '[A-Z_]' |
sed -e 's/\..*//' \
-e 's/^\(..........\).*/\1/'
}
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index b066c282c..1f02a62ff 100644
--- a/packages/OS400/make-lib.sh
+++ b/packages/OS400/make-lib.sh
@@ -13,7 +13,7 @@ cd "${TOPDIR}/lib"
echo '#pragma comment(user, "libcurl version '"${LIBCURL_VERSION}"'")' > 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
LINK= # No need to rebuild service program yet.
MODULES=