Commit 26ebfa0c authored by Jeff Trawick's avatar Jeff Trawick
Browse files

as Bill did with threaded, don't let a child process return to parent code 

when make_child() returns

fix a bad type for the len parm to apr_bucket_read()


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

server/mpm/experimental/perchild/perchild.c

+2 −3
Original line number Diff line number Diff line
@@ -979,8 +979,7 @@ static int make_child(server_rec *s, int slot) 
        apr_signal(SIGTERM, just_die);

	*/

        child_main(slot);



	return 0;

        clean_child_exit(0);

    }

    /* else */

    ap_child_table[slot].pid = pid;
@@ -1356,7 +1355,7 @@ static int pass_request(request_rec *r) 
                            ap_get_module_config(r->server->module_config, 

                                                 &mpm_perchild_module);

    char *foo;

    int len;

    apr_size_t len;



    apr_pool_userdata_get((void **)&foo, "PERCHILD_BUFFER", r->connection->pool);

    len = strlen(foo);

server/mpm/perchild/perchild.c

+2 −3
Original line number Diff line number Diff line
@@ -979,8 +979,7 @@ static int make_child(server_rec *s, int slot) 
        apr_signal(SIGTERM, just_die);

	*/

        child_main(slot);



	return 0;

        clean_child_exit(0);

    }

    /* else */

    ap_child_table[slot].pid = pid;
@@ -1356,7 +1355,7 @@ static int pass_request(request_rec *r) 
                            ap_get_module_config(r->server->module_config, 

                                                 &mpm_perchild_module);

    char *foo;

    int len;

    apr_size_t len;



    apr_pool_userdata_get((void **)&foo, "PERCHILD_BUFFER", r->connection->pool);

    len = strlen(foo);