Back out accidental inclusion of REMOTE_FORCE_HOST change.

Reviewed by:
Submitted by:
Obtained from:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78532 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/APACHE_1_2_X/src/include/http_core.h b/APACHE_1_2_X/src/include/http_core.h
index b360b9cdd5e48f1bf558fe0616252829c288e19d..8454b81ad1184807dd83a851ccd71bebe6e4f37b 100644 (file)
--- a/APACHE_1_2_X/src/include/http_core.h
+++ b/APACHE_1_2_X/src/include/http_core.h
@@ -77,7 +77,6 @@
 #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

diff --git a/APACHE_1_2_X/src/main/http_core.c b/APACHE_1_2_X/src/main/http_core.c
index db1c288b46679d7f8093be422b1edcf903d7b131..39a6e6bc8f6097318bc1bf1bc6c3ba282d8127e9 100644 (file)
--- a/APACHE_1_2_X/src/main/http_core.c
+++ b/APACHE_1_2_X/src/main/http_core.c
@@ -338,9 +338,7 @@ get_remote_host(conn_rec *conn, void *dir_config, int type)
     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))
+   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,7 +383,7 @@ get_remote_host(conn_rec *conn, void *dir_config, int type)
        return conn->remote_host;
     else
     {
-       if (type == REMOTE_HOST || type == REMOTE_FORCE_HOST) return NULL;
+       if (type == REMOTE_HOST) return NULL;
        else return conn->remote_ip;
     }
 }

diff --git a/APACHE_1_2_X/src/modules/standard/mod_access.c b/APACHE_1_2_X/src/modules/standard/mod_access.c
index ad29a2e32b3075ea62ac20fffc23956ad4ff1fcc..eb3523801237782f6d1a7f7b12df41cc1c82cd2e 100644 (file)
--- a/APACHE_1_2_X/src/modules/standard/mod_access.c
+++ b/APACHE_1_2_X/src/modules/standard/mod_access.c
@@ -206,7 +206,7 @@ int find_allowdeny (request_rec *r, array_header *a, int method)
 
        if (!gothost) {
            remotehost = get_remote_host(r->connection, r->per_dir_config,
-                                        REMOTE_FORCE_HOST);
+                                        REMOTE_HOST);
 
            if ((remotehost == NULL) || is_ip(remotehost))
                gothost = 1;