ben 97/03/04 13:44:42
Modified: src CHANGES buff.c http_main.c mod_include.c
Log:
Remove cleanups from bpushfd().
Revision Changes Path
1.183 +7 -1 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.182
retrieving revision 1.183
diff -C3 -r1.182 -r1.183
*** CHANGES 1997/03/03 19:30:32 1.182
--- CHANGES 1997/03/04 21:44:37 1.183
***************
*** 1,5 ****
Changes with Apache 1.2b8
!
*) Fix bug in suexec reintroduced by changes in 1.2b7 which allows
initgroups() to hose the group information needed for later
comparisons. [Randy Terbush]
--- 1,11 ----
Changes with Apache 1.2b8
!
! *) bpushfd() no longer notes cleanups for the file descriptors it is
handed.
! Module authors may need to adjust their code for proper cleanup to take
! place (that is, call note_cleanups_for_fd()). This change fixes
problems
! with file descriptors being erroneously closed when the proxy module
was
! in use. [Ben Laurie]
!
*) Fix bug in suexec reintroduced by changes in 1.2b7 which allows
initgroups() to hose the group information needed for later
comparisons. [Randy Terbush]
1.23 +0 -4 apache/src/buff.c
Index: buff.c
===================================================================
RCS file: /export/home/cvs/apache/src/buff.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C3 -r1.22 -r1.23
*** buff.c 1997/02/28 13:39:35 1.22
--- buff.c 1997/03/04 21:44:38 1.23
***************
*** 150,159 ****
{
fb->fd = fd_out;
fb->fd_in = fd_in;
- if(fb->fd >= 0)
- note_cleanups_for_fd(fb->pool,fb->fd);
- if(fb->fd != fb->fd_in && fb->fd_in >= 0)
- note_cleanups_for_fd(fb->pool,fb->fd_in);
}
int
--- 150,155 ----
1.127 +3 -0 apache/src/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -C3 -r1.126 -r1.127
*** http_main.c 1997/02/28 13:58:07 1.126
--- http_main.c 1997/03/04 21:44:38 1.127
***************
*** 1725,1730 ****
--- 1725,1732 ----
accept_mutex_off(); /* unlock after "accept" */
+ note_cleanups_for_fd(ptrans,csd);
+
/*
* We now have a connection, so set it up with the appropriate
* socket options, file descriptors, and read/write buffers.
***************
*** 1748,1753 ****
--- 1750,1756 ----
log_unixerr("dup", NULL, "couldn't duplicate csd", server_conf);
dupped_csd = csd; /* Oh well... */
}
+ note_cleanups_for_fd(ptrans,dupped_csd);
#endif
bpushfd(conn_io, csd, dupped_csd);
1.26 +4 -4 apache/src/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache/src/mod_include.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C3 -r1.25 -r1.26
*** mod_include.c 1997/02/20 00:58:52 1.25
--- mod_include.c 1997/03/04 21:44:39 1.26
***************
*** 404,413 ****
while ((ch = *in++) != '\0') {
switch(ch) {
case '\\':
! if(*in == '$')
! *next++=*in++;
! else
! *next++=ch;
break;
case '$':
{
--- 404,413 ----
while ((ch = *in++) != '\0') {
switch(ch) {
case '\\':
! if(*in == '$')
! *next++=*in++;
! else
! *next++=ch;
break;
case '$':
{
