From: Eric Covener <covener@apache.org>
Date: Tue, 3 Jan 2017 17:47:49 +0000 (+0000)
Subject: restore r = NULL; dropped by hand-merge.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=710d71091786272f463dd8e4e98b1374934be77c;p=thirdparty%2Fapache%2Fhttpd.git

restore r = NULL; dropped by hand-merge.

Confirmed with Bill over email.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777178 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index 4a22b766f77..67afdf05ddd 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1274,6 +1274,7 @@ request_rec *ap_read_request(conn_rec *conn)
             return r;
         default:
             apr_brigade_destroy(tmp_bb);
+            r = NULL;
             return r;
         }
     }