httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@hyperreal.com>
Subject cvs commit: apache/src CHANGES http_main.c
Date Tue, 24 Dec 1996 19:17:52 GMT
randy       96/12/24 11:17:52

  Modified:    src       CHANGES http_main.c
  Log:
  Be more verbose about the error message give for invalded ServerName
  parameters.
  Reviewed by:	Chuck Murcko, Randy Terbush
  Submitted by:	Dirk vanGulik
  
  Revision  Changes    Path
  1.97      +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -C3 -r1.96 -r1.97
  *** CHANGES	1996/12/24 19:10:28	1.96
  --- CHANGES	1996/12/24 19:17:49	1.97
  ***************
  *** 1,5 ****
  --- 1,8 ----
    Changes with Apache 1.2b3:
    
  +   *) Add changes to improve the error message given for invalid
  +      ServerName parameters. [Dirk vanGulik]
  + 
      *) Add "Authoratative" directive for Auth modules that don't
         currently have it. This gives admin control to assign authoritative
         control to an authentication scheme and allow "fall through" for
  
  
  
  1.97      +10 -2     apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -C3 -r1.96 -r1.97
  *** http_main.c	1996/12/15 15:09:34	1.96
  --- http_main.c	1996/12/24 19:17:50	1.97
  ***************
  *** 1302,1319 ****
        server_addr_rec *sar;
        int has_inaddr_any;
        int mainport = s->port;
    
        /* Main host first */
        
        if (!s->server_hostname) {
    	s->server_hostname = get_local_host(pconf);
        }
    
        def_hostname = s->server_hostname;
        h = gethostbyname(def_hostname);
        if( h == NULL ) {
  ! 	fprintf(stderr,"httpd: cannot determine local host name.\n");
  ! 	fprintf(stderr,"Use ServerName to set it manually.\n");
    	exit(1);
        }
        /* we need to use gethostbyaddr below... and since it shares a static
  --- 1302,1327 ----
        server_addr_rec *sar;
        int has_inaddr_any;
        int mainport = s->port;
  +     int from_local=0;  
    
        /* Main host first */
        
        if (!s->server_hostname) {
    	s->server_hostname = get_local_host(pconf);
  + 	from_local = 1;
        }
    
        def_hostname = s->server_hostname;
        h = gethostbyname(def_hostname);
        if( h == NULL ) {
  ! 	fprintf(stderr,"httpd: cannot determine the IP address of ");
  ! 	if (from_local) {
  ! 	   fprintf(stderr,"the local host (%s). Use ServerName to set it manually.\n",
  ! 		s->server_hostname ? s->server_hostname : "<NULL>");
  ! 	} else {
  ! 	   fprintf(stderr,"the specified ServerName (%s).\n",
  ! 		s->server_hostname ? s->server_hostname : "<NULL>");
  ! 	};
    	exit(1);
        }
        /* we need to use gethostbyaddr below... and since it shares a static
  
  
  

Mime
View raw message