From: Jeff Trawick <trawick@apache.org>
Date: Thu, 5 Apr 2001 17:03:13 +0000 (+0000)
Subject: as Bill did with threaded, don't let a child process return to parent code
X-Git-Tag: 2.0.17~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c22377f12a44ff09d2e96830df40aeccb0c36c63;p=apache

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

diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c
index 2a7092f593..edf3083ab4 100644
--- a/server/mpm/experimental/perchild/perchild.c
+++ b/server/mpm/experimental/perchild/perchild.c
@@ -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);
diff --git a/server/mpm/perchild/perchild.c b/server/mpm/perchild/perchild.c
index 2a7092f593..edf3083ab4 100644
--- a/server/mpm/perchild/perchild.c
+++ b/server/mpm/perchild/perchild.c
@@ -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);