* Follow up to r1893497: Make use of ap_pre_connection in mpm_motorz and mpm_simple_io

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

diff --git a/server/mpm/motorz/motorz.c b/server/mpm/motorz/motorz.c
index 42ce39be5eb870973087c65424ead2157b6f9cb8..01d83d8011af7773158ba20aa544d19b518269cc 100644 (file)
--- a/server/mpm/motorz/motorz.c
+++ b/server/mpm/motorz/motorz.c
@@ -152,13 +152,12 @@ static void *motorz_io_setup_conn(apr_thread_t *thread, void *baton)
 
     ap_update_vhost_given_ip(scon->c);
 
-    status = ap_run_pre_connection(scon->c, scon->sock);
+    status = ap_pre_connection(scon->c, scon->sock);
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(03317)
                          "motorz_io_setup_conn(): did pre-conn");
     if (status != OK && status != DONE) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(02843)
                      "motorz_io_setup_conn: connection aborted");
-        scon->c->aborted = 1;
     }
 
     scon->cs.state = CONN_STATE_READ_REQUEST_LINE;

diff --git a/server/mpm/simple/simple_io.c b/server/mpm/simple/simple_io.c
index 191d13ce25081cfa2202f5a5f110bad6fd6d6286..4d83aa430b72b5c478aa66f0f86285b251bf671f 100644 (file)
--- a/server/mpm/simple/simple_io.c
+++ b/server/mpm/simple/simple_io.c
@@ -227,11 +227,10 @@ static void *simple_io_setup_conn(apr_thread_t * thread, void *baton)
 
     ap_update_vhost_given_ip(scon->c);
 
-    rv = ap_run_pre_connection(scon->c, scon->sock);
+    rv = ap_pre_connection(scon->c, scon->sock);
     if (rv != OK && rv != DONE) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ap_server_conf, APLOGNO(00253)
                      "simple_io_setup_conn: connection aborted");
-        scon->c->aborted = 1;
     }
 
     scon->cs.state = CONN_STATE_READ_REQUEST_LINE;