From 1db2f476c567aa7fb19abed86cb80f5ec9d5f1ed Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 20 Dec 2016 03:38:59 +0000 Subject: [PATCH] Fix strict Host: header checking on EBCDIC on zOS, isascii() really means 7 bit ascii, but our strings are in ebcdic for 99.95% of the lifetime of the server. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1775199 13f79535-47bb-0310-9956-ffa450edef68 --- server/vhost.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/vhost.c b/server/vhost.c index 1896595653..e0aaedc656 100644 --- a/server/vhost.c +++ b/server/vhost.c @@ -757,10 +757,13 @@ static apr_status_t strict_hostname_check(request_rec *r, char *host) int is_dotted_decimal = 1, leading_zeroes = 0, dots = 0; for (ch = host; *ch; ch++) { +#if ! APR_CHARSET_EBCDIC if (!apr_isascii(*ch)) { goto bad; } - else if (apr_isalpha(*ch) || *ch == '-') { + else +#endif + if (apr_isalpha(*ch) || *ch == '-') { is_dotted_decimal = 0; } else if (ch[0] == '.') { -- 2.40.0