httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Sun, 03 Jan 1999 16:45:27 GMT
dgaudet     99/01/03 08:45:27

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Back out roy's previous change -- this sort of thing should be handled
  by a cleanup if a module really needs it.  Unless someone can demonstrate
  that there is broken libc code somewhere that absolutely needs this...
  
  Revision  Changes    Path
  1.1199    +0 -5      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1198
  retrieving revision 1.1199
  diff -u -r1.1198 -r1.1199
  --- CHANGES	1999/01/03 13:35:30	1.1198
  +++ CHANGES	1999/01/03 16:45:23	1.1199
  @@ -3,11 +3,6 @@
     *) Change the ap_assert macro to a variant that works on all platforms.
        [Richard Prinz <richard.prinz@cso.net>] PR#2575
   
  -  *) In order to prevent some errant library code from setting an alarm
  -     on one request and having it affect some later connection, force the
  -     alarm to be cleared before each connection even if Apache's own
  -     timeouts are being handled by the parent. [Roy Fielding]
  -
     *) Make sure under ELF-based NetBSD (now) and OpenBSD (future) we don't
        search for an underscore on dlsym() (as it's already the case
        for FreeBSD 3.0). [Todd Vierling <tv@pobox.com>] PR#2462
  
  
  
  1.418     +1 -4      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.417
  retrieving revision 1.418
  diff -u -r1.417 -r1.418
  --- http_main.c	1999/01/03 13:09:48	1.417
  +++ http_main.c	1999/01/03 16:45:25	1.418
  @@ -3610,10 +3610,7 @@
   	 * (Re)initialize this child to a pre-connection state.
   	 */
   
  -	ap_kill_timeout(0);	/* Cancel any outstanding alarms */
  -#ifdef OPTIMIZE_TIMEOUTS
  -	alarm(0);		/* even if not set by Apache routines */
  -#endif
  +	ap_kill_timeout(0);	/* Cancel any outstanding alarms. */
   	current_conn = NULL;
   
   	ap_clear_pool(ptrans);
  
  
  

Mime
View raw message