aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Monnerat <pm@datasphere.ch>2012-11-12 14:26:16 +0100
committerPatrick Monnerat <pm@datasphere.ch>2012-11-12 14:26:16 +0100
commit4b994e14fbcd67c60023ee95f967719da24e3e94 (patch)
tree0798f33bb699a19bbcb843584dc607ae2a407ee2
parente237402c47444e97b4947d22d91aa50f90a67d74 (diff)
OS400: upgrade wrappers for the 7.28.1 release.
-rw-r--r--packages/OS400/README.OS4002
-rw-r--r--packages/OS400/ccsidcurl.c4
-rw-r--r--packages/OS400/curl.inc.in52
-rw-r--r--packages/OS400/initscript.sh7
-rw-r--r--packages/OS400/make-lib.sh2
5 files changed, 57 insertions, 10 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 8e2dc7f45..9890d067a 100644
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -73,6 +73,7 @@ options:
CURLOPT_COPYPOSTFIELDS
CURLOPT_CRLFILE
CURLOPT_CUSTOMREQUEST
+ CURLOPT_DNS_SERVERS
CURLOPT_EGDSOCKET
CURLOPT_ENCODING
CURLOPT_FTP_ACCOUNT
@@ -83,6 +84,7 @@ options:
CURLOPT_KEYPASSWD
CURLOPT_KRBLEVEL
CURLOPT_MAIL_FROM
+ CURLOPT_MAIL_AUTH
CURLOPT_NETRC_FILE
CURLOPT_NOPROXY
CURLOPT_PASSWORD
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 2943ba62f..1baff3951 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1032,7 +1032,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
#ifdef USE_TLS_SRP
if ((int) STRING_LAST != (int) STRING_TLSAUTH_PASSWORD + 1)
#else
- if ((int) STRING_LAST != (int) STRING_MAIL_FROM + 1)
+ if ((int) STRING_LAST != (int) STRING_MAIL_AUTH + 1)
#endif
curl_mfprintf(stderr,
"*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
@@ -1051,6 +1051,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_COOKIELIST:
case CURLOPT_CRLFILE:
case CURLOPT_CUSTOMREQUEST:
+ case CURLOPT_DNS_SERVERS:
case CURLOPT_EGDSOCKET:
case CURLOPT_ENCODING:
case CURLOPT_FTP_ACCOUNT:
@@ -1061,6 +1062,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
case CURLOPT_KEYPASSWD:
case CURLOPT_KRBLEVEL:
case CURLOPT_MAIL_FROM:
+ case CURLOPT_MAIL_AUTH:
case CURLOPT_NETRC_FILE:
case CURLOPT_NOPROXY:
case CURLOPT_PASSWORD:
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 836c83db3..33ca12a42 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -173,6 +173,8 @@
d c X'00000004'
d CURLSSH_AUTH_KEYBOARD...
d c X'00000008'
+ d CURLSSH_AUTH_AGENT...
+ d c X'00000010'
d CURLSSH_AUTH_DEFAULT...
d c X'7FFFFFFF' CURLSSH_AUTH_ANY
*
@@ -236,8 +238,10 @@
d c 1
d CURL_REDIR_POST_302...
d c 2
+ d CURL_REDIR_POST_303...
+ d c 4
d CURL_REDIR_POST_ALL...
- d c 3
+ d c 7
*
d CURL_POLL_NONE c 0
d CURL_POLL_IN c 1
@@ -299,6 +303,13 @@
d CURL_FNMATCHFUNC_FAIL...
d c 2
*
+ d CURL_WAIT_POLLIN...
+ d c X'0001'
+ d CURL_WAIT_POLLPRI...
+ d c X'0002'
+ d CURL_WAIT_POLLOUT...
+ d c X'0004'
+ *
**************************************************************************
* Types
**************************************************************************
@@ -327,11 +338,11 @@
d c 8
d CURLE_REMOTE_ACCESS_DENIED...
d c 9
- d CURLE_OBSOLETE10...
+ d CURLE_FTP_ACCEPT_FAILED...
d c 10
d CURLE_FTP_WEIRD_PASS_REPLY...
d c 11
- d CURLE_OBSOLETE12...
+ d CURLE_FTP_ACCEPT_TIMEOUT...
d c 12
d CURLE_FTP_WEIRD_PASV_REPLY...
d c 13
@@ -641,6 +652,9 @@
d CURLUSESSL_ALL...
d c 3
*
+ d CURLSSLOPT_ALLOW_BEAST...
+ d c 1
+ *
/if not defined(CURL_NO_OLDIES)
d curl_ftpssl s like(curl_usessl)
d based(######ptr######)
@@ -1124,6 +1138,20 @@
d c 10209
d CURLOPT_GSSAPI_DELEGATION...
d c 00210
+ d CURLOPT_DNS_SERVERS...
+ d c 10211
+ d CURLOPT_ACCEPTTIMEOUT_MS...
+ d c 00212
+ d CURLOPT_TCP_KEEPALIVE...
+ d c 00213
+ d CURLOPT_TCP_KEEPIDLE...
+ d c 00214
+ d CURLOPT_TCP_KEEPINTVL...
+ d c 00215
+ d CURLOPT_SSL_OPTIONS...
+ d c 00216
+ d CURLOPT_MAIL_AUTH...
+ d c 10217
*
/if not defined(CURL_NO_OLDIES)
d CURLOPT_SSLKEYPASSWD...
@@ -1385,6 +1413,8 @@
d curlsocktype s 10i 0 based(######ptr######) Enum
d CURLSOCKTYPE_IPCXN...
d c 0
+ d CURLSOCKTYPE_ACCEPT...
+ d c 1
*
d CURL_SOCKOPT_OK...
d c 0
@@ -1471,6 +1501,13 @@
d whatever * overlay(data) void *
d result overlay(data) like(CURLcode)
*
+ d curl_waitfd...
+ d ds based(######ptr######)
+ d qualified
+ d fd like(curl_socket_t)
+ d events 5i 0
+ d revents 5i 0
+ *
d curl_http_post...
d ds based(######ptr######)
d qualified
@@ -1916,6 +1953,15 @@
d exc_fd_set 65535 options(*varsize) fd_set
d max_fd 10i 0
*
+ d curl_multi_wait...
+ d pr extproc('curl_multi_wait')
+ d like(CURLMcode)
+ d multi_handle * value CURLM *
+ d extra_fds * value curl_waitfd *
+ d extra_nfds 10u 0 value
+ d timeout_ms 10i 0 value
+ d ret 10i 0 options(*omit)
+ *
d curl_multi_perform...
d pr extproc('curl_multi_perform')
d like(CURLMcode)
diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index d28a8db11..c07355fc0 100644
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -157,11 +157,8 @@ db2_name()
basename "${1}" |
tr 'a-z-' 'A-Z_' |
sed -e 's/\..*//' \
- -e 's/\([^_]\)[^_]*_\(.*\)/\1\2/' \
- -e 's/\([^_]\)\([^_]\)[^_]*_\(.*\)/\1\2\3/' \
- -e 's/\([^_]\)\([^_]\)\([^_]\)[^_]*_\(.*\)/\1\2\3\4/' \
- -e 's/\([^_]\)\([^_]\)\([^_]\)\([^_]\)[^_]*_\(.*\)/\1\2\3\4\5/' \
- -e 's/^\(..........\).*/\1/'
+ -e 's/^CURL_*/C/' \
+ -e 's/^\(.\).*\(.........\)$/\1\2/'
}
diff --git a/packages/OS400/make-lib.sh b/packages/OS400/make-lib.sh
index 46c479c3f..a9e1c3861 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(user, __DATE__)' >> os400.c
echo '#pragma comment(user, __TIME__)' >> os400.c
-echo '#pragma comment(copyright, "Copyright (C) 1998-2011 Daniel Stenberg et al. OS/400 version by P. Monnerat")' >> os400.c
+echo '#pragma comment(copyright, "Copyright (C) 1998-2012 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=