httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Roy Fielding <field...@hyperreal.com>
Subject cvs commit: apache/src http_main.c
Date Fri, 22 Nov 1996 03:17:10 GMT
fielding    96/11/21 19:17:09

  Modified:    src       http_main.c
  Log:
  Fixed the problems with kill -USR1 leaving children around too long
  and causing server crash at next kill -HUP. I.e., fixed graceful restarts.
  Submitted by: Ben Laurie (ben@algroup.co.uk)
  Reviewed by: Roy Fielding, Paul Richards
  
  Revision  Changes    Path
  1.89      +9 -9      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -C3 -r1.88 -r1.89
  *** http_main.c	1996/11/17 21:09:37	1.88
  --- http_main.c	1996/11/22 03:17:07	1.89
  ***************
  *** 1809,1829 ****
        
        default_server_hostnames (server_conf);
    
  !     if (listeners == NULL)
  !     {
  !         if(!is_graceful)
  ! 	    {
    	    memset((char *) &sa_server, 0, sizeof(sa_server));
    	    sa_server.sin_family=AF_INET;
    	    sa_server.sin_addr=bind_address;
    	    sa_server.sin_port=htons(server_conf->port);
    
    	    sd = make_sock(pconf, &sa_server);
  ! 	    }
  ! 	else
  ! 	    sd=saved_sd;
  !     } else
  !     {
    	listen_rec *lr;
    	int fd;
    
  --- 1809,1829 ----
        
        default_server_hostnames (server_conf);
    
  !     if (listeners == NULL) {
  !         if(!is_graceful) {
    	    memset((char *) &sa_server, 0, sizeof(sa_server));
    	    sa_server.sin_family=AF_INET;
    	    sa_server.sin_addr=bind_address;
    	    sa_server.sin_port=htons(server_conf->port);
    
    	    sd = make_sock(pconf, &sa_server);
  ! 	}
  ! 	else {
  ! 	    sd = saved_sd;
  ! 	    note_cleanups_for_fd(pconf, sd);
  ! 	}
  !     }
  !     else {
    	listen_rec *lr;
    	int fd;
    
  
  
  

Mime
View raw message