Mailing List Archive

Author: rpluem
Date: Tue Sep 21 20:05:05 2021
New Revision: 1893498

URL: http://svn.apache.org/viewvc?rev=1893498&view=rev
Log:
* Follow up to r1893497: Make use of ap_pre_connection in mpm_motorz and mpm_simple_io

Modified:
httpd/httpd/trunk/server/mpm/motorz/motorz.c
httpd/httpd/trunk/server/mpm/simple/simple_io.c

Modified: httpd/httpd/trunk/server/mpm/motorz/motorz.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/motorz/motorz.c?rev=1893498&r1=1893497&r2=1893498&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/motorz/motorz.c (original)
+++ httpd/httpd/trunk/server/mpm/motorz/motorz.c Tue Sep 21 20:05:05 2021
@@ -152,13 +152,12 @@ static void *motorz_io_setup_conn(apr_th

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;

Modified: httpd/httpd/trunk/server/mpm/simple/simple_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/simple/simple_io.c?rev=1893498&r1=1893497&r2=1893498&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/simple/simple_io.c (original)
+++ httpd/httpd/trunk/server/mpm/simple/simple_io.c Tue Sep 21 20:05:05 2021
@@ -227,11 +227,10 @@ static void *simple_io_setup_conn(apr_th

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;