diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2016-11-12 23:47:29 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2016-11-12 23:47:29 +0000 |
| commit | 966cd9999eea3526467d15e70e80f6ab623f83d8 (patch) | |
| tree | c32ecd27fee293e4b699cc8869a1045bd5a3c2ba | |
| parent | 2baefd2dc7f118caeec3b532630392d425d84b45 (diff) | |
| download | httpd-966cd9999eea3526467d15e70e80f6ab623f83d8.tar.gz | |
Partial Backport of r1746884, no-op changes that introduce patch conflicts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict@1769454 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | server/protocol.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/server/protocol.c b/server/protocol.c index 487c362732..9b8c19263a 100644 --- a/server/protocol.c +++ b/server/protocol.c @@ -400,7 +400,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_core(char **s, apr_size_t n, */ if (do_alloc) { tmp = NULL; - } else { + } + else { /* We're null terminated. */ tmp = last_char; } @@ -605,7 +606,7 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) * happen if it exceeds the configured limit for a request-line. */ if (APR_STATUS_IS_ENOSPC(rv)) { - r->status = HTTP_REQUEST_URI_TOO_LARGE; + r->status = HTTP_REQUEST_URI_TOO_LARGE; } else if (APR_STATUS_IS_TIMEUP(rv)) { r->status = HTTP_REQUEST_TIME_OUT; @@ -656,7 +657,8 @@ static int read_request_line(request_rec *r, apr_bucket_brigade *bb) r->assbackwards = 0; pro = ll; len = strlen(ll); - } else { + } + else { r->assbackwards = 1; pro = "HTTP/0.9"; len = 8; |