httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1621419 - in /httpd/httpd/trunk: modules/proxy/proxy_util.c server/protocol.c
Date Sat, 30 Aug 2014 06:51:12 GMT
Author: jailletc36
Date: Sat Aug 30 06:51:11 2014
New Revision: 1621419

URL: http://svn.apache.org/r1621419
Log:
Fix sscanf format spotted by cppcheck.
Improve alignment.
Untested.

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c
    httpd/httpd/trunk/server/protocol.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1621419&r1=1621418&r2=1621419&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sat Aug 30 06:51:11 2014
@@ -2589,7 +2589,7 @@ static apr_status_t send_http_connect(pr
 
     /* Check for HTTP_OK response status */
     if (status == APR_SUCCESS) {
-        int major, minor;
+        unsigned int major, minor;
         /* Only scan for three character status code */
         char code_str[4];
 
@@ -2607,7 +2607,7 @@ static apr_status_t send_http_connect(pr
                 ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00950)
                              "send_http_connect: the forward proxy returned code is '%s'",
                              code_str);
-            status = APR_INCOMPLETE;
+                status = APR_INCOMPLETE;
             }
         }
     }
@@ -3529,7 +3529,7 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbr
 
         /* for sub-requests, ignore freshness/expiry headers */
         if (r->main) {
-            if (    !strcasecmp(headers_in[counter].key, "If-Match")
+            if (   !strcasecmp(headers_in[counter].key, "If-Match")
                 || !strcasecmp(headers_in[counter].key, "If-Modified-Since")
                 || !strcasecmp(headers_in[counter].key, "If-Range")
                 || !strcasecmp(headers_in[counter].key, "If-Unmodified-Since")

Modified: httpd/httpd/trunk/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/protocol.c?rev=1621419&r1=1621418&r2=1621419&view=diff
==============================================================================
--- httpd/httpd/trunk/server/protocol.c (original)
+++ httpd/httpd/trunk/server/protocol.c Sat Aug 30 06:51:11 2014
@@ -559,7 +559,7 @@ static int read_request_line(request_rec
     const char *uri;
     const char *pro;
 
-    int major = 1, minor = 0;   /* Assume HTTP/1.0 if non-"HTTP" protocol */
+    unsigned int major = 1, minor = 0;   /* Assume HTTP/1.0 if non-"HTTP" protocol */
     char http[5];
     apr_size_t len;
     int num_blank_lines = 0;



Mime
View raw message