svn commit: r1756824 - /httpd/httpd/trunk/server/protocol.c

[jo...@apache.org]

Author: jorton
Date: Thu Aug 18 15:49:25 2016
New Revision: 1756824

URL: http://svn.apache.org/viewvc?rev=1756824&view=rev
Log:
* server/protocol.c (read_request_line): Fix compiler warnings with
  GCC.

Modified:
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1756824&r1=1756823&r2=1756824&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Thu Aug 18 15:49:25 2016
@@ -668,7 +668,7 @@ static int read_request_line(request_rec
         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
         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
     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;