diff options
| author | Stephan Mühlstrasser <stm@pdflib.com> | 2018-04-26 10:15:26 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-05-03 15:19:20 +0200 |
| commit | 7f41432c191c70f7f782802cd17e95e87a9a7671 (patch) | |
| tree | 04d464d49968e5a04c8c1f6739ad9eda81acd2a0 /lib/curl_ctype.h | |
| parent | 0be4679ba93361b36187d500fb0a26b2acb05e32 (diff) | |
URL: fix ASCII dependency in strcpy_url and strlen_url
Commit 3c630f9b0af097663a64e5c875c580aa9808a92b partially reverted the
changes from commit dd7521bcc1b7a6fcb53c31f9bd1192fcc884bd56 because of
the problem that strcpy_url() was modified unilaterally without also
modifying strlen_url(). As a consequence strcpy_url() was again
depending on ASCII encoding.
This change fixes strlen_url() and strcpy_url() in parallel to use a
common host-encoding independent criterion for deciding whether an URL
character must be %-escaped.
Closes #2535
Diffstat (limited to 'lib/curl_ctype.h')
| -rw-r--r-- | lib/curl_ctype.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/curl_ctype.h b/lib/curl_ctype.h index 1ffecb99a..6e94bb1b4 100644 --- a/lib/curl_ctype.h +++ b/lib/curl_ctype.h @@ -45,6 +45,7 @@ #define ISPRINT(x) (isprint((int) ((unsigned char)x))) #define ISUPPER(x) (isupper((int) ((unsigned char)x))) #define ISLOWER(x) (islower((int) ((unsigned char)x))) +#define ISCNTRL(x) (iscntrl((int) ((unsigned char)x))) #define ISASCII(x) (isascii((int) ((unsigned char)x))) #else @@ -58,6 +59,7 @@ int Curl_isprint(int c); int Curl_isalpha(int c); int Curl_isupper(int c); int Curl_islower(int c); +int Curl_iscntrl(int c); #define ISSPACE(x) (Curl_isspace((int) ((unsigned char)x))) #define ISDIGIT(x) (Curl_isdigit((int) ((unsigned char)x))) @@ -68,6 +70,7 @@ int Curl_islower(int c); #define ISPRINT(x) (Curl_isprint((int) ((unsigned char)x))) #define ISUPPER(x) (Curl_isupper((int) ((unsigned char)x))) #define ISLOWER(x) (Curl_islower((int) ((unsigned char)x))) +#define ISCNTRL(x) (Curl_iscntrl((int) ((unsigned char)x))) #define ISASCII(x) (((x) >= 0) && ((x) <= 0x80)) #endif |