Commit 1e3ff044 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Begin to move the code that updates the child status out of the MPMs and 

into the main-line code.  This ensures that all MPMs can easily forget
about updating their status.


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

CHANGES

+4 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Begin to move the calls to update_child_status into common code, so

     that each individual MPM does not need to update the scoreboard itself.

     [Ryan Bloom]



  *) Allow mod_tls to compile under Unix boxes where openssl has been

     installed to the system include files.

     [Gomez Henri <new-httpd@slib.fr>]

server/connection.c

+3 −0
Original line number Diff line number Diff line
@@ -269,6 +269,9 @@ conn_rec *ap_new_connection(apr_pool_t *p, server_rec *server, 
    conn_rec *conn = (conn_rec *) apr_pcalloc(p, sizeof(conn_rec));

    apr_status_t rv;



    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(id), 

                                  SERVER_BUSY_READ, (request_rec *) NULL);



    /* Got a connection structure, so initialize what fields we can

     * (the rest are zeroed out by pcalloc).

     */

server/mpm/dexter/dexter.c

+0 −3
Original line number Diff line number Diff line
@@ -419,9 +419,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, long conn_id) 


    ap_sock_disable_nagle(sock);



    (void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(conn_id),

                                  SERVER_BUSY_READ, (request_rec *) NULL);



    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);

    if (current_conn) {

        ap_process_connection(current_conn);

server/mpm/mpmt_pthread/mpmt_pthread.c

+0 −3
Original line number Diff line number Diff line
@@ -414,9 +414,6 @@ static void process_socket(apr_pool_t *p, apr_socket_t *sock, int my_child_num, 


    ap_sock_disable_nagle(sock);



    (void) ap_update_child_status(my_child_num, my_thread_num,  

				  SERVER_BUSY_READ, (request_rec *) NULL);



    current_conn = ap_new_connection(p, ap_server_conf, sock, conn_id);

    if (current_conn) {

        ap_process_connection(current_conn);

server/mpm/prefork/prefork.c

+0 −3
Original line number Diff line number Diff line
@@ -790,9 +790,6 @@ static void child_main(int child_num_arg) 


	ap_sock_disable_nagle(csd);



	(void) ap_update_child_status(AP_CHILD_THREAD_FROM_ID(my_child_num), SERVER_BUSY_READ,

				   (request_rec *) NULL);



	current_conn = ap_new_connection(ptrans, ap_server_conf, csd, 

                                         my_child_num);

        if (current_conn) {