www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity

This gets perchild compiling and serving pages again. It does NOT

Browse Source 
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
This commit is contained in:
Ryan Bloom
2001-12-19 17:50:38 +00:00
parent 57f5bf7a31
commit 0511d4ff22
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/mpm/experimental/perchild/mpm.h
View File

@@ -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 */

4
server/mpm/experimental/perchild/perchild.c
View File

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

2
server/mpm/perchild/mpm.h
View File

@@ -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 */

4
server/mpm/perchild/perchild.c
View File

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