httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexei Kosut <ako...@organic.com>
Subject Re: "Graceful Restart" patch
Date Sun, 23 Jun 1996 20:34:49 GMT
On Sun, 23 Jun 1996, Aram Mirzadeh wrote:

> > 1) My patch to fix inetd CGI requests. No one's seen fit yet to
> >    comment.
> 
> I thought we were going to dump inetd.  And go with standlone only?   If not
> I have one more for inetd.  It seems to ignore x-server-parse when in inetd
> mode.  <!--#exec cmd="xxx"--> always returns a null where the same config
> in standalone works fine.

We probably will dump it for the next release, but for now, we still
support inetd. Theoretically. Hmm... that bug is probably the same as the
CGI one. Maybe we'd best go for a more general fix (which is to not call
note_cleanups_for_file() from spawn_child() for inetd requests), rather
than the mod_cgi-specific one I posted earlier. Try the following patch
(untested):

Index: alloc.c
===================================================================
RCS file: /export/home/cvs/apache/src/alloc.c,v
retrieving revision 1.6
diff -c -r1.6 alloc.c
*** alloc.c	1996/06/17 20:43:45	1.6
--- alloc.c	1996/06/23 20:31:49
***************
*** 64,69 ****
--- 64,71 ----
  
  #include <stdarg.h>
  
+ extern int standalone;
+ 
  /*****************************************************************
   *
   * Managing free storage blocks...
***************
*** 896,902 ****
      *pipe_out = fdopen (out_fds[0], "r");
  #endif  
    
!     if (*pipe_out) note_cleanups_for_file (p, *pipe_out);
    }
  
    if (pipe_in) {
--- 898,904 ----
      *pipe_out = fdopen (out_fds[0], "r");
  #endif  
    
!     if (*pipe_out && standalone) note_cleanups_for_file (p, *pipe_out);
    }
  
    if (pipe_in) {
***************
*** 908,914 ****
      *pipe_in = fdopen (in_fds[1], "w");
  #endif
      
!     if (*pipe_in) note_cleanups_for_file (p, *pipe_in);
    }
  
    unblock_alarms();
--- 910,916 ----
      *pipe_in = fdopen (in_fds[1], "w");
  #endif
      
!     if (*pipe_in && standalone) note_cleanups_for_file (p, *pipe_in);
    }
  
    unblock_alarms();


-- Alexei Kosut <akosut@organic.com>            The Apache HTTP Server 
   http://www.nueva.pvt.k12.ca.us/~akosut/      http://www.apache.org/


Mime
View raw message