Received: (from majordom@localhost)
	by hyperreal.org (8.8.5/8.8.5) id KAA15566;
	Sat, 5 Jul 1997 10:56:53 -0700 (PDT)
Received: (from marc@localhost)
	by hyperreal.org (8.8.5/8.8.5) id KAA15560
	for apache-cvs; Sat, 5 Jul 1997 10:56:51 -0700 (PDT)
Date: Sat, 5 Jul 1997 10:56:51 -0700 (PDT)
From: Marc Slemko <marc@hyperreal.org>
Message-Id: <199707051756.KAA15560@hyperreal.org>
To: apache-cvs@hyperreal.org
Subject: cvs commit: apache/src http_core.c http_core.h mod_access.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

marc        97/07/05 10:56:51

  Modified:    src       Tag: APACHE_1_2_X  http_core.c http_core.h
                        mod_access.c
  Log:
  Back out accidental inclusion of REMOTE_FORCE_HOST change.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.81.2.4  +2 -4      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.81.2.3
  retrieving revision 1.81.2.4
  diff -C3 -r1.81.2.3 -r1.81.2.4
  *** http_core.c	1997/07/03 05:59:44	1.81.2.3
  --- http_core.c	1997/07/05 17:56:49	1.81.2.4
  ***************
  *** 338,346 ****
        if (dir_config) 
    	dir_conf = (core_dir_config *)get_module_config(dir_config, &core_module);
    
  !    if ((!dir_conf) || (type == REMOTE_FORCE_HOST && conn->remote_host == NULL)
  ! 	|| (type != REMOTE_NOLOOKUP
  ! 	    && conn->remote_host == NULL && dir_conf->hostname_lookups))
        {
    #ifdef STATUS
    	int old_stat = update_child_status(conn->child_num,
  --- 338,344 ----
        if (dir_config) 
    	dir_conf = (core_dir_config *)get_module_config(dir_config, &core_module);
    
  !    if ((!dir_conf) || (type != REMOTE_NOLOOKUP && conn->remote_host == NULL && dir_conf->hostname_lookups))
        {
    #ifdef STATUS
    	int old_stat = update_child_status(conn->child_num,
  ***************
  *** 385,391 ****
    	return conn->remote_host;
        else
        {
  ! 	if (type == REMOTE_HOST || type == REMOTE_FORCE_HOST) return NULL;
    	else return conn->remote_ip;
        }
    }
  --- 383,389 ----
    	return conn->remote_host;
        else
        {
  ! 	if (type == REMOTE_HOST) return NULL;
    	else return conn->remote_ip;
        }
    }
  
  
  
  1.20.2.2  +0 -1      apache/src/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.h,v
  retrieving revision 1.20.2.1
  retrieving revision 1.20.2.2
  diff -C3 -r1.20.2.1 -r1.20.2.2
  *** http_core.h	1997/07/03 05:59:45	1.20.2.1
  --- http_core.h	1997/07/05 17:56:49	1.20.2.2
  ***************
  *** 77,83 ****
    #define REMOTE_HOST (0)
    #define REMOTE_NAME (1)
    #define REMOTE_NOLOOKUP (2)
  - #define REMOTE_FORCE_HOST (3)
    
    #define SATISFY_ALL 0
    #define SATISFY_ANY 1
  --- 77,82 ----
  
  
  
  1.16.2.2  +1 -1      apache/src/mod_access.c
  
  Index: mod_access.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/mod_access.c,v
  retrieving revision 1.16.2.1
  retrieving revision 1.16.2.2
  diff -C3 -r1.16.2.1 -r1.16.2.2
  *** mod_access.c	1997/07/03 05:59:45	1.16.2.1
  --- mod_access.c	1997/07/05 17:56:49	1.16.2.2
  ***************
  *** 206,212 ****
    
    	if (!gothost) {
    	    remotehost = get_remote_host(r->connection, r->per_dir_config,
  ! 	                                 REMOTE_FORCE_HOST);
    
    	    if ((remotehost == NULL) || is_ip(remotehost))
    	        gothost = 1;
  --- 206,212 ----
    
    	if (!gothost) {
    	    remotehost = get_remote_host(r->connection, r->per_dir_config,
  ! 	                                 REMOTE_HOST);
    
    	    if ((remotehost == NULL) || is_ip(remotehost))
    	        gothost = 1;