From: Stas Bekman <stas@apache.org>
Date: Tue, 25 Feb 2003 23:25:19 +0000 (+0000)
Subject: check the return value of ap_run_pre_connection(). So if the
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b105aa8d20e61e323a83fc253d807b06693c0ca7;p=thirdparty%2Fapache%2Fhttpd.git

check the return value of ap_run_pre_connection(). So if the
pre_connection phase fails (without setting c->aborted)
ap_run_process_connection is not executed.
PR:
Obtained from:
Submitted by:
Reviewed by:	trawick, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98798 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/connection.c b/server/connection.c
index ac0e80fd9a9..a7c1b3f21f6 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -199,10 +199,14 @@ AP_DECLARE(void) ap_lingering_close(conn_rec *c)
 
 AP_CORE_DECLARE(void) ap_process_connection(conn_rec *c, void *csd)
 {
+    apr_status_t rc;
     ap_update_vhost_given_ip(c);
 
-    ap_run_pre_connection(c, csd);
-
+    rc = ap_run_pre_connection(c, csd);
+    if (rc != OK && rc != DONE) {
+        c->aborted = 1;
+    }
+    
     if (!c->aborted) {
         ap_run_process_connection(c);
     }