]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
restore r = NULL; dropped by hand-merge.
authorEric Covener <covener@apache.org>
Tue, 3 Jan 2017 17:47:49 +0000 (17:47 +0000)
committerEric Covener <covener@apache.org>
Tue, 3 Jan 2017 17:47:49 +0000 (17:47 +0000)
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

server/protocol.c

index 4a22b766f779c90cd1f3aeccb7993036e3937ea0..67afdf05ddd1a2e77ae622777861cdc01e0de41f 100644 (file)
@@ -1274,6 +1274,7 @@ request_rec *ap_read_request(conn_rec *conn)
             return r;
         default:
             apr_brigade_destroy(tmp_bb);
+            r = NULL;
             return r;
         }
     }