diff options
| author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2008-04-07 13:09:17 +0000 |
|---|---|---|
| committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2008-04-07 13:09:17 +0000 |
| commit | a08b6ae813df73c90b2cfc8364c4ff1eb0723d84 (patch) | |
| tree | 9437559e59017a129b62cb7772f8be0bd2acf90f /packages | |
| parent | 74c500b6ec839112daa83590fdb8c3de5f2071ff (diff) | |
Adapt OS400 SSL (qssl.h) to V5R4
Fix qssl.c wrong error message
Upgrade OS400 wrappers and makefiles to 7.18.1
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 6 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 5 | ||||
| -rw-r--r-- | packages/OS400/initscript.sh | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index f5ae8921e..17f5c85a1 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -867,6 +867,12 @@ curl_formadd_ccsid(struct curl_httppost * * httppost, break; + case CURLFORM_STREAM: + if (!forms) + value = (char *) va_arg(arg, void *); + + break; + case CURLFORM_CONTENTTYPE: /* If a previous content has been encountered, convert it now. */ diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index dd6685b67..eae8da6ab 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -109,6 +109,8 @@ d c X'00000010' d HTTPPOST_PTRBUFFER... d c X'00000020' + d HTTPPOST_CALLBACK... + d c X'00000040' * d CURL_READFUNC_ABORT... d c X'10000000' @@ -815,6 +817,8 @@ d c 17 d CURLFORM_OBSOLETE2... d c 18 + d CURLFORM_STREAM... + d c 19 * d CURLINFO s 10i 0 based(######ptr######) Enum d CURLINFO_EFFECTIVE_URL... CURLINFO_STRING + 1 @@ -1035,6 +1039,7 @@ d more * curl_httppost * d flags 10i 0 long d showfilename * char * + d userp * void * * d curl_sockaddr ds based(######ptr######) d qualified diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh index b851e366b..4dcbe7235 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/' } |