From: dgaudet <dgaudet@unknown>
Date: Thu, 3 Jul 1997 05:59:45 +0000 (+0000)
Subject: PR#695: fix problem compiling http_bprintf.c with gcc under SCO
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3cc0b1524c422fc22fa0f75a607ab7f63799f1a;p=thirdparty%2Fapache%2Fhttpd.git

PR#695: fix problem compiling http_bprintf.c with gcc under SCO

Submitted by:        Marc Slemko
Reviewed by: Dean Gaudet, Randy Terbush


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

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index b145aed8d1a..12313e5e95a 100644
--- a/APACHE_1_2_X/src/CHANGES
+++ b/APACHE_1_2_X/src/CHANGES
@@ -95,6 +95,9 @@ Changes with Apache 1.2.1
 
   *) PORT: Workaround for AIX 3.x compiler bug in http_bprintf.c.  
      [Marc Slemko] PR#725
+  
+  *) PORT: fix problem compiling http_bprintf.c with gcc under SCO
+     [Marc Slemko] PR#695
 
 Changes with Apache 1.2
 
diff --git a/APACHE_1_2_X/src/Configure b/APACHE_1_2_X/src/Configure
index 41f08ad112e..9f01d2148c9 100755
--- a/APACHE_1_2_X/src/Configure
+++ b/APACHE_1_2_X/src/Configure
@@ -375,7 +375,9 @@ case "$PLAT" in
 	OS='SCO 5'
 	CFLAGS="$CFLAGS -DSCO5"
 	LIBS="$LIBS -lsocket -lmalloc -lprot"
-	OSBPRINTF="-K noinline"
+	if [ "$CC" = "cc" ] || [ "$COMPILER" = "cc" ]; then
+	    OSBPRINTF="-K noinline"
+	fi
 	DEF_WANTHSREGEX=no
 	;;
     *-solaris2*)
diff --git a/APACHE_1_2_X/src/include/http_core.h b/APACHE_1_2_X/src/include/http_core.h
index 8454b81ad11..b360b9cdd5e 100644
--- a/APACHE_1_2_X/src/include/http_core.h
+++ b/APACHE_1_2_X/src/include/http_core.h
@@ -77,6 +77,7 @@
 #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 39a6e6bc8f6..db1c288b466 100644
--- a/APACHE_1_2_X/src/main/http_core.c
+++ b/APACHE_1_2_X/src/main/http_core.c
@@ -338,7 +338,9 @@ 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_NOLOOKUP && conn->remote_host == NULL && dir_conf->hostname_lookups))
+   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,
@@ -383,7 +385,7 @@ get_remote_host(conn_rec *conn, void *dir_config, int type)
 	return conn->remote_host;
     else
     {
-	if (type == REMOTE_HOST) return NULL;
+	if (type == REMOTE_HOST || type == REMOTE_FORCE_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 eb352380123..ad29a2e32b3 100644
--- 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_HOST);
+	                                 REMOTE_FORCE_HOST);
 
 	    if ((remotehost == NULL) || is_ip(remotehost))
 	        gothost = 1;