mirror of
https://github.com/apache/httpd.git
synced 2025-09-01 02:02:06 +03:00
This begins to remove BUFF from the server. The idea is to go very slowly
with this. To begin with, we store both the socket and the BUFF in the conn_rec. Functions are free to use which ever they want, in the end all of the data goes to the same place. This modifies all of the MPMs except Windows. All of the Unix MPMs are working, but the others need to be tested. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86651 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -392,7 +392,6 @@ int ap_graceful_stop_signalled(void)
|
||||
|
||||
static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num, int my_thread_num)
|
||||
{
|
||||
BUFF *conn_io;
|
||||
conn_rec *current_conn;
|
||||
long conn_id = my_child_num * HARD_THREAD_LIMIT + my_thread_num;
|
||||
int csd;
|
||||
@@ -413,10 +412,8 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num,
|
||||
|
||||
(void) ap_update_child_status(my_child_num, my_thread_num,
|
||||
SERVER_BUSY_READ, (request_rec *) NULL);
|
||||
conn_io = ap_bcreate(p, B_RDWR);
|
||||
ap_bpush_socket(conn_io, sock);
|
||||
|
||||
current_conn = ap_new_apr_connection(p, ap_server_conf, conn_io, sock,
|
||||
current_conn = ap_new_apr_connection(p, ap_server_conf, sock,
|
||||
conn_id);
|
||||
|
||||
ap_process_connection(current_conn);
|
||||
|
Reference in New Issue
Block a user