cvs commit: apache/src CHANGES http_config.c

[Ben Laurie <be...@hyperreal.com>]

ben         96/06/29 12:52:13

  Modified:    src       CHANGES http_config.c
  Log:
  Virtual hosts couldn't have keepalive didn't. Fixed.
  
  Revision  Changes    Path
  1.36      +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -C3 -r1.35 -r1.36
  *** CHANGES	1996/06/26 22:52:09	1.35
  --- CHANGES	1996/06/29 19:52:10	1.36
  ***************
  *** 1,3 ****
  --- 1,6 ----
  +   *) Make virtual hosts default to main server keepalive parameters.
  +      [Alexei Kosut, Ben Laurie]
  + 
      *) Allow ScanHTMLTitles to work with lowercase <title> tags. [Alexei Kosut]
    
      *) Bugs which were fixed:
  
  
  
  1.13      +2 -2      apache/src/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_config.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -C3 -r1.12 -r1.13
  *** http_config.c	1996/06/28 19:28:00	1.12
  --- http_config.c	1996/06/29 19:52:11	1.13
  ***************
  *** 653,659 ****
        s->access_confname = NULL;
        s->timeout = 0;
        s->keep_alive_timeout = 0;
  !     s->keep_alive = 0;
        s->host_addr.s_addr = get_virthost_addr (hostname, &s->host_port);
        s->port = s->host_port;  /* set them the same, by default */
        s->next = NULL;
  --- 653,659 ----
        s->access_confname = NULL;
        s->timeout = 0;
        s->keep_alive_timeout = 0;
  !     s->keep_alive = -1;
        s->host_addr.s_addr = get_virthost_addr (hostname, &s->host_port);
        s->port = s->host_port;  /* set them the same, by default */
        s->next = NULL;
  ***************
  *** 703,709 ****
    	if (virt->keep_alive_timeout == 0)
    	    virt->keep_alive_timeout = main_server->keep_alive_timeout;
    
  ! 	if (virt->keep_alive == 0)
    	    virt->keep_alive = main_server->keep_alive;
        }
    }
  --- 703,709 ----
    	if (virt->keep_alive_timeout == 0)
    	    virt->keep_alive_timeout = main_server->keep_alive_timeout;
    
  ! 	if (virt->keep_alive == -1)
    	    virt->keep_alive = main_server->keep_alive;
        }
    }