diff options
| author | Ryan Bloom <rbb@apache.org> | 2001-12-19 18:50:38 +0100 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2001-12-19 18:50:38 +0100 |
| commit | 0511d4ff2270cc1ddd68944f4a147cb9ceee99bc (patch) | |
| tree | 19951f3e25efad834bde872a53f153ca6c95ce2f /server/mpm/experimental/perchild | |
| parent | Remove an extra semi-colon. (diff) | |
| download | apache2-0511d4ff2270cc1ddd68944f4a147cb9ceee99bc.tar.xz apache2-0511d4ff2270cc1ddd68944f4a147cb9ceee99bc.zip | |
This gets perchild compiling and serving pages again. It does NOT
pass file descriptors yet. That is a much bigger project.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92535 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/experimental/perchild')
| -rw-r--r-- | server/mpm/experimental/perchild/mpm.h | 2 | ||||
| -rw-r--r-- | server/mpm/experimental/perchild/perchild.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/server/mpm/experimental/perchild/mpm.h b/server/mpm/experimental/perchild/mpm.h index 646a6aeae3..7c40723000 100644 --- a/server/mpm/experimental/perchild/mpm.h +++ b/server/mpm/experimental/perchild/mpm.h @@ -78,7 +78,7 @@ #define AP_MPM_WANT_SET_ACCEPT_LOCK_MECH #define MPM_SYNC_CHILD_TABLE() -#define MPM_CHILD_PID(i) (ap_child_table[i].pid) +#define MPM_CHILD_PID(i) (ap_scoreboard_image->parent[i].pid) #define MPM_NOTE_CHILD_KILLED(i) (MPM_CHILD_PID(i) = 0) /* Table of child status */ diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 8cb0f84c1c..b3cd5cde8b 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -1452,7 +1452,7 @@ static void perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pte static int pass_request(request_rec *r) { - apr_socket_t *thesock = r->connection->client_socket; + apr_socket_t *thesock = ap_get_module_config(r->connection->conn_config, &core_module); struct msghdr msg; struct cmsghdr *cmsg; int sfd; @@ -1582,7 +1582,7 @@ static int perchild_post_read(request_rec *r) apr_os_sock_put(&csd, &thread_socket_table[thread_num], r->connection->pool); ap_sock_disable_nagle(csd); - r->connection->client_socket = csd; + ap_set_module_config(r->connection->conn_config, &core_module, csd); return OK; } else { |