httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Fri, 02 Mar 2001 12:35:59 GMT
martin      01/03/02 04:35:59

  Modified:    src/main http_main.c
  Log:
  Ignasi writes:
    Both mod_ssl and KAME-ipv6 patch sets are adding the
    if (fd >= 0) in the FD_SET(fd, &listenfds) on http_main.c.
    I think this patch doesn't concert neither to mod_ssl nor to IPv6.
  
  I agree, and I think it avoids a potential core dump too.
  Submitted by:	"Roca Carrio, Ignasi" <Ignasi.Roca@fujitsu-siemens.com>
  
  Revision  Changes    Path
  1.531     +2 -1      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.530
  retrieving revision 1.531
  diff -u -u -r1.530 -r1.531
  --- http_main.c	2001/02/22 16:07:16	1.530
  +++ http_main.c	2001/03/02 12:35:53	1.531
  @@ -3548,7 +3548,8 @@
   	else {
   	    ap_note_cleanups_for_socket(p, fd);
   	}
  -	FD_SET(fd, &listenfds);
  +	if (fd >= 0) /* avoid negative offsets ;-) */
  +	    FD_SET(fd, &listenfds);
   	if (fd > listenmaxfd)
   	    listenmaxfd = fd;
   	lr->fd = fd;
  
  
  

Mime
View raw message