www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Fix sscanf format spotted by cppcheck.

Browse Source 
Improve alignment.
Untested.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621419 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christophe Jaillet
2014-08-30 06:51:11 +00:00
parent 3bd80dadb5
commit f1176161be
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/proxy/proxy_util.c
View File

@@ -2589,7 +2589,7 @@ static apr_status_t send_http_connect(proxy_conn_rec *backend,
/* Check for HTTP_OK response status */ /* Check for HTTP_OK response status */
if (status == APR_SUCCESS) { if (status == APR_SUCCESS) {
int major, minor; unsigned int major, minor;
/* Only scan for three character status code */ /* Only scan for three character status code */
char code_str[4]; char code_str[4];
@@ -2607,7 +2607,7 @@ static apr_status_t send_http_connect(proxy_conn_rec *backend,
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00950) ap_log_error(APLOG_MARK, APLOG_ERR, 0, s, APLOGNO(00950)
"send_http_connect: the forward proxy returned code is '%s'", "send_http_connect: the forward proxy returned code is '%s'",
code_str); code_str);
status = APR_INCOMPLETE; status = APR_INCOMPLETE;
} }
} }
} }
@@ -3529,7 +3529,7 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p,
/* for sub-requests, ignore freshness/expiry headers */ /* for sub-requests, ignore freshness/expiry headers */
if (r->main) { 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-Modified-Since")
|| !strcasecmp(headers_in[counter].key, "If-Range") || !strcasecmp(headers_in[counter].key, "If-Range")
|| !strcasecmp(headers_in[counter].key, "If-Unmodified-Since") || !strcasecmp(headers_in[counter].key, "If-Unmodified-Since")

2
server/protocol.c
View File

@@ -559,7 +559,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb)
const char *uri; const char *uri;
const char *pro; 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]; char http[5];
apr_size_t len; apr_size_t len;
int num_blank_lines = 0; int num_blank_lines = 0;