]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
os400: correct EXPECTED_STRING_LASTZEROTERMINATED
authorJon Rumsey <jrumsey@uk.ibm.com>
Wed, 19 Jul 2023 13:49:34 +0000 (14:49 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Thu, 20 Jul 2023 21:43:28 +0000 (23:43 +0200)
Correct EXPECTED_STRING_LASTZEROTERMINATED to account for
CURLOPT_HAPROXY_CLIENT_IP which requires EBCDIC to ASCII conversion when
passed into curl_easy_setopt().

Closes #11476

packages/OS400/ccsidcurl.c
packages/OS400/chkstrings.c

index cbb5079d6f70b529a2443d4eb64fd079c3484b31..c59617ef5f4dabbf63efc7e5bec56cffc80db65b 100644 (file)
@@ -1164,6 +1164,7 @@ curl_easy_setopt_ccsid(CURL *easy, CURLoption tag, ...)
   case CURLOPT_USERNAME:
   case CURLOPT_USERPWD:
   case CURLOPT_XOAUTH2_BEARER:
+  case CURLOPT_HAPROXY_CLIENT_IP:
     s = va_arg(arg, char *);
     ccsid = va_arg(arg, unsigned int);
 
index 626710896896aad7b27a8f3ba7c9180643fbab41..9841ec938a26e64c801d1cc71e536a700590641e 100644 (file)
@@ -37,7 +37,7 @@
  * made, the EXPECTED_STRING_LASTZEROTERMINATED/EXPECTED_STRING_LAST
  * values can be updated to match the latest enum values in urldata.h.
  */
-#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_AWS_SIGV4 + 1)
+#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_HAPROXY_CLIENT_IP + 1)
 #define EXPECTED_STRING_LAST                (STRING_COPYPOSTFIELDS + 1)
 
 int main(int argc, char *argv[])