]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix strict Host: header checking on EBCDIC
authorEric Covener <covener@apache.org>
Tue, 20 Dec 2016 03:38:59 +0000 (03:38 +0000)
committerEric Covener <covener@apache.org>
Tue, 20 Dec 2016 03:38:59 +0000 (03:38 +0000)
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

index 1896595653598a2dba758c54df86717f02854527..e0aaedc6562f119eea82e0f6faced5950ffbd053 100644 (file)
@@ -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] == '.') {