]> granicus.if.org Git - apache/commitdiff
* server/protocol.c (read_request_line): Fix compiler warnings with
authorJoe Orton <jorton@apache.org>
Thu, 18 Aug 2016 15:49:25 +0000 (15:49 +0000)
committerJoe Orton <jorton@apache.org>
Thu, 18 Aug 2016 15:49:25 +0000 (15:49 +0000)
  GCC.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756824 13f79535-47bb-0310-9956-ffa450edef68

server/protocol.c

index 55df5f09ba06b85575eaba0ee4178b46d9c5200f..ed1ff100a636d8fd3da0201afd31053230ae682f 100644 (file)
@@ -668,7 +668,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
         deferred_error = rrl_excesswhitespace; 
     }
     for (uri = ll; apr_isspace(*uri); ++uri) 
-        if (strchr(badwhitespace, *uri) && deferred_error == rrl_none)
+        if (ap_strchr_c(badwhitespace, *uri) && deferred_error == rrl_none)
             deferred_error = rrl_badwhitespace; 
     *ll = '\0';
     if (!*uri && deferred_error == rrl_none)
@@ -680,7 +680,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
         goto rrl_done;
     }
     for (r->protocol = ll; apr_isspace(*r->protocol); ++r->protocol) 
-        if (strchr(badwhitespace, *r->protocol) && deferred_error == rrl_none)
+        if (ap_strchr_c(badwhitespace, *r->protocol) && deferred_error == rrl_none)
             deferred_error = rrl_badwhitespace; 
     *ll = '\0';
     if (!(ll = strpbrk(r->protocol, " \t\n\v\f\r"))) {
@@ -691,7 +691,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
     if (strictspaces && *ll)
         deferred_error = rrl_excesswhitespace; 
     for ( ; apr_isspace(*ll); ++ll)
-        if (strchr(badwhitespace, *ll) && deferred_error == rrl_none)
+        if (ap_strchr_c(badwhitespace, *ll) && deferred_error == rrl_none)
             deferred_error = rrl_badwhitespace; 
     if (*ll && deferred_error == rrl_none)
         deferred_error = rrl_trailingtext;