Commit 552bcb80 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Remove more network logic from the MPMs. Essentially, each MPM can define 

AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK, which tells Apache to disable_nagle
on the accepted socket.


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

server/core.c

+4 −0
Original line number Diff line number Diff line
@@ -3281,6 +3281,10 @@ static conn_rec *core_create_conn(apr_pool_t *ptrans, apr_socket_t *csd, 
{

    core_net_rec *net = apr_palloc(ptrans, sizeof(*net));



#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK

    ap_sock_disable_nagle(csd);

#endif



    net->in_ctx = NULL;

    net->out_ctx = NULL;

    net->c = ap_core_new_connection(ptrans, ap_server_conf, csd,

server/mpm/mpmt_os2/mpm.h

+1 −0
Original line number Diff line number Diff line
@@ -70,5 +70,6 @@ 
extern server_rec *ap_server_conf;

#define AP_MPM_WANT_SET_PIDFILE

#define AP_MPM_WANT_SET_MAX_REQUESTS

#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK



#endif /* APACHE_MPM_SPMT_OS2_H */

server/mpm/mpmt_os2/mpmt_os2_child.c

+0 −1
Original line number Diff line number Diff line
@@ -406,7 +406,6 @@ static void worker_main(void *vpArg) 
    while (rc = DosReadQueue(workq, &rd, &len, (PPVOID)&worker_args, 0, DCWW_WAIT, &priority, NULLHANDLE),

           rc == 0 && rd.ulData != WORKTYPE_EXIT) {

        pconn = worker_args->pconn;

        ap_sock_disable_nagle(worker_args->conn_sd);

        current_conn = ap_run_create_connection(pconn, worker_args->conn_sd, conn_id);



        if (current_conn) {

server/mpm/netware/mpm.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
  #define AP_MPM_WANT_SET_LOCKFILE 

*/

#define AP_MPM_WANT_SET_MAX_REQUESTS

#define AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK

/*#define AP_MPM_WANT_SET_COREDUMPDIR

  #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH 

*/

server/mpm/netware/mpm_netware.c

+0 −2
Original line number Diff line number Diff line
@@ -504,8 +504,6 @@ got_listener: 
        * We now have a connection, so set it up with the appropriate

        * socket options, file descriptors, and read/write buffers.

        */

        ap_sock_disable_nagle(csd);



        current_conn = ap_run_create_connection(ptrans, csd, my_worker_num);

        if (current_conn) {

            ap_process_connection(current_conn);