VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1893498 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2021-09-21 20:05:05 +00:00
parent 6d9a8cd1f2
commit a117a32b04
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/mpm/motorz/motorz.c
View File

@ -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;

3
server/mpm/simple/simple_io.c
View File

@ -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;