httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@locus.apache.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Sat, 19 Aug 2000 01:37:36 GMT
fanf        00/08/18 18:37:35

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Fix error handling in make_sock
  Reviewed by:	dean
  
  Revision  Changes    Path
  1.1568    +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1567
  retrieving revision 1.1568
  diff -u -u -r1.1567 -r1.1568
  --- CHANGES	2000/07/21 23:53:05	1.1567
  +++ CHANGES	2000/08/19 01:37:33	1.1568
  @@ -1,5 +1,7 @@
   Changes with Apache 1.3.13
   
  +  *) Fix error handling in make_sock. [Tony Finch]
  +
     *) The htdocs/ tree has been moved out of the CVS source tree into
        a separate area for easier development.  This has NO EFFECT on
        end-users or Apache installations.  [Ken Coar]
  
  
  
  1.508     +7 -9      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.507
  retrieving revision 1.508
  diff -u -u -r1.507 -r1.508
  --- http_main.c	2000/07/29 23:56:19	1.507
  +++ http_main.c	2000/08/19 01:37:35	1.508
  @@ -3306,7 +3306,7 @@
   	close(s);
   #endif
   	ap_unblock_alarms();
  -	return -1;
  +	exit(1);
       }
   #endif /*_OSD_POSIX*/
       one = 1;
  @@ -3321,7 +3321,7 @@
   #endif
   
   	ap_unblock_alarms();
  -	return -1;
  +	exit(1);
       }
   #endif
   
  @@ -3418,7 +3418,7 @@
   #else
   	close(s);
   #endif
  -	return -1;
  +	exit(1);
       }
   #endif
   
  @@ -3505,16 +3505,14 @@
       for (;;) {
   	fd = find_listener(lr);
   	if (fd < 0) {
  -        fd = make_sock(p, &lr->local_addr);
  +	    fd = make_sock(p, &lr->local_addr);
   	}
   	else {
   	    ap_note_cleanups_for_socket(p, fd);
  -	}
  -	if (fd >= 0) {
  -	    FD_SET(fd, &listenfds);
  -	    if (fd > listenmaxfd)
  -		listenmaxfd = fd;
   	}
  +	FD_SET(fd, &listenfds);
  +	if (fd > listenmaxfd)
  +	    listenmaxfd = fd;
   	lr->fd = fd;
   	if (lr->next == NULL)
   	    break;
  
  
  

Mime
View raw message