httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.com>
Subject cvs commit: apache/src http_protocol.c httpd.h mod_proxy.c mod_status.c scoreboard.h
Date Tue, 26 Mar 1996 20:31:33 GMT
ben         96/03/26 12:31:32

  Modified:    src       http_protocol.c httpd.h mod_proxy.c mod_status.c
                        scoreboard.h
  Log:
  Damn, two fixes in one.
  1. Move some definitions around for mod_status.
  2. Fix a missing NULL in pstrcat, and an uninitialized variable in mod_proxy.c.
  
  Revision  Changes    Path
  1.11      +1 -1      apache/src/http_protocol.c
  
  Index: http_protocol.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_protocol.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -C3 -r1.10 -r1.11
  *** http_protocol.c	1996/03/26 09:06:24	1.10
  --- http_protocol.c	1996/03/26 20:31:27	1.11
  ***************
  *** 260,266 ****
    
      /* This routine parses full URLs, if they match the server */
      if (strncmp(uri, "http://", 7)) return uri;
  !   name = pstrcat(r->pool, uri + 7);
      
      /* Find the hostname, assuming a valid request */
      i = ind(name, '/');
  --- 260,266 ----
    
      /* This routine parses full URLs, if they match the server */
      if (strncmp(uri, "http://", 7)) return uri;
  !   name = pstrcat(r->pool, uri + 7,NULL);
      
      /* Find the hostname, assuming a valid request */
      i = ind(name, '/');
  
  
  
  1.10      +2 -0      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** httpd.h	1996/03/05 17:28:49	1.9
  --- httpd.h	1996/03/26 20:31:27	1.10
  ***************
  *** 518,520 ****
  --- 518,522 ----
         
    char *get_local_host(pool *);
    unsigned long get_virthost_addr (char *hostname, short int *port);
  + 
  + time_t restart_time;
  
  
  
  1.10      +4 -4      apache/src/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_proxy.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -C3 -r1.9 -r1.10
  *** mod_proxy.c	1996/03/22 01:05:22	1.9
  --- mod_proxy.c	1996/03/26 20:31:28	1.10
  ***************
  *** 2058,2065 ****
        
        if (linebuff[len-1] != '\n')
        {
  ! 	len = bskiplf(f);
  ! 	if (len != 1) return len;
        }
    
    /* skip continuation lines */    
  --- 2058,2065 ----
        
        if (linebuff[len-1] != '\n')
        {
  ! 	i = bskiplf(f);
  ! 	if (i != 1) return i;
        }
    
    /* skip continuation lines */    
  ***************
  *** 2074,2081 ****
    	    if (len < 5) return 0;
    	    if (linebuff[len-1] != '\n')
    	    {
  ! 		len = bskiplf(f);
  ! 		if (len != 1) return i;
    	    }
    	} while (memcmp(linebuff, buff, 4) != 0);
        }
  --- 2074,2081 ----
    	    if (len < 5) return 0;
    	    if (linebuff[len-1] != '\n')
    	    {
  ! 		i = bskiplf(f);
  ! 		if (i != 1) return i;
    	    }
    	} while (memcmp(linebuff, buff, 4) != 0);
        }
  
  
  
  1.2       +0 -4      apache/src/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_status.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** mod_status.c	1996/03/25 11:35:10	1.1
  --- mod_status.c	1996/03/26 20:31:29	1.2
  ***************
  *** 126,135 ****
        rputs(buf,r);
    }
    
  - 
  - extern short_score get_scoreboard_info(int x);
  - extern time_t restart_time;
  - 
    /* Main handler for x-httpd-status requests */
    
    int status_handler (request_rec *r)
  --- 126,131 ----
  
  
  
  1.4       +1 -0      apache/src/scoreboard.h
  
  Index: scoreboard.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/scoreboard.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -C3 -r1.3 -r1.4
  *** scoreboard.h	1996/03/25 10:54:30	1.3
  --- scoreboard.h	1996/03/26 20:31:29	1.4
  ***************
  *** 94,96 ****
  --- 94,97 ----
    #define HARD_SERVER_MAX 150
    
    extern void sync_scoreboard_image(void);
  + short_score get_scoreboard_info(int x);
  
  
  

Mime
View raw message