httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jim Jagielski <...@hyperreal.com>
Subject cvs commit: apache/src http_main.c http_protocol.c httpd.h
Date Wed, 28 May 1997 23:52:04 GMT
jim         97/05/28 16:52:02

  Modified:    src       http_main.c http_protocol.c httpd.h
  Log:
  Eds patches which Virtual Hosts on different ports and timeout logging
  
  Revision  Changes    Path
  1.147     +5 -0      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.146
  retrieving revision 1.147
  diff -C3 -r1.146 -r1.147
  *** http_main.c	1997/05/27 04:41:50	1.146
  --- http_main.c	1997/05/28 23:51:57	1.147
  ***************
  *** 415,420 ****
  --- 415,425 ----
    	    else log_req = log_req->prev;
    	}
    	
  + /* If we didn't get SIGPIPE and we didn't set the method number,
  +  * then it's safe to say the client timed out
  +  */
  +         if (sig != SIGPIPE && log_req->method_number == M_NONE)
  +             log_req->status = HTTP_REQUEST_TIME_OUT;
    	if (!current_conn->keptalive) 
                log_transaction(log_req);
    
  
  
  
  1.124     +3 -1      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -C3 -r1.123 -r1.124
  *** http_protocol.c	1997/05/27 04:41:51	1.123
  --- http_protocol.c	1997/05/28 23:51:58	1.124
  ***************
  *** 711,717 ****
    
        /* search all the names from <VirtualHost> directive */
        for( sar = s->addrs; sar; sar = sar->next ) {
  !       if( !strcasecmp( sar->virthost, host ) ) {
    	r->server = r->connection->server = s;
    	if( r->hostlen && !strncmp( r->uri, "http://", 7) ) {
    	  r->uri += r->hostlen;
  --- 711,718 ----
    
        /* search all the names from <VirtualHost> directive */
        for( sar = s->addrs; sar; sar = sar->next ) {
  !       if( !strcasecmp( sar->virthost, host ) &&
  !        ( (sar->host_port == 0) || (port == sar->host_port) )) {
    	r->server = r->connection->server = s;
    	if( r->hostlen && !strncmp( r->uri, "http://", 7) ) {
    	  r->uri += r->hostlen;
  ***************
  *** 789,794 ****
  --- 790,796 ----
    				 * Only changed by die(), or (bletch!)
    				 * scan_script_header...
    				 */
  +     r->method_number = M_NONE;  /* Until we finish reading a request */
    
        /* Get the request... */
        
  
  
  
  1.106     +1 -0      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -C3 -r1.105 -r1.106
  *** httpd.h	1997/05/27 04:41:49	1.105
  --- httpd.h	1997/05/28 23:51:59	1.106
  ***************
  *** 347,352 ****
  --- 347,353 ----
    
    
    #define METHODS 8
  + #define M_NONE -1
    #define M_GET 0
    #define M_PUT 1
    #define M_POST 2
  
  
  

Mime
View raw message