aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/qssl.c8
-rw-r--r--packages/OS400/ccsidcurl.c6
-rw-r--r--packages/OS400/curl.inc.in5
-rw-r--r--packages/OS400/initscript.sh2
4 files changed, 16 insertions, 5 deletions
diff --git a/lib/qssl.c b/lib/qssl.c
index ad04cc7b3..15684096d 100644
--- a/lib/qssl.c
+++ b/lib/qssl.c
@@ -90,7 +90,7 @@ static CURLcode Curl_qsossl_init_session(struct SessionHandle * data)
memset((char *) &initappstr, 0, sizeof initappstr);
initappstr.applicationID = certname;
initappstr.applicationIDLen = strlen(certname);
- initappstr.protocol = TLSV1_SSLV3;
+ initappstr.protocol = SSL_VERSION_CURRENT; /* TLSV1 compat. SSLV[23]. */
initappstr.sessionType = SSL_REGISTERED_AS_CLIENT;
rc = SSL_Init_Application(&initappstr);
@@ -190,7 +190,7 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
default:
case CURL_SSLVERSION_DEFAULT:
- h->protocol = TLSV1_SSLV3;
+ h->protocol = SSL_VERSION_CURRENT; /* TLSV1 compat. SSLV[23]. */
break;
case CURL_SSLVERSION_TLSv1:
@@ -228,11 +228,11 @@ static CURLcode Curl_qsossl_handshake(struct connectdata * conn, int sockindex)
return CURLE_SSL_CERTPROBLEM;
case SSL_ERROR_IO:
- failf(data, "SSL_Handshake(): %s", SSL_Strerror(rc, NULL));
+ failf(data, "SSL_Handshake() I/O error: %s", strerror(errno));
return CURLE_SSL_CONNECT_ERROR;
default:
- failf(data, "SSL_Init(): %s", SSL_Strerror(rc, NULL));
+ failf(data, "SSL_Handshake(): %s", SSL_Strerror(rc, NULL));
return CURLE_SSL_CONNECT_ERROR;
}
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/'
}