You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2016/11/12 23:47:30 UTC
svn commit: r1769454 -
/httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c
Author: wrowe
Date: Sat Nov 12 23:47:29 2016
New Revision: 1769454
URL: http://svn.apache.org/viewvc?rev=1769454&view=rev
Log:
Partial Backport of r1746884, no-op changes that introduce patch conflicts.
Modified:
httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c
Modified: httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c?rev=1769454&r1=1769453&r2=1769454&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c (original)
+++ httpd/httpd/branches/2.4.x-merge-http-strict/server/protocol.c Sat Nov 12 23:47:29 2016
@@ -400,7 +400,8 @@ AP_DECLARE(apr_status_t) ap_rgetline_cor
*/
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
* 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->assbackwards = 0;
pro = ll;
len = strlen(ll);
- } else {
+ }
+ else {
r->assbackwards = 1;
pro = "HTTP/0.9";
len = 8;