Sun Oct 24 21:36:15 CEST 1999
Modified Files in squid/include
	autoconf.h.in 
Modified Files in squid
	acconfig.h configure configure.in 

Merged squid-2.2.STABLE4.enable_underscores.patch

Squid-2.2.STABLE4: --enable-underscores
    Added --enable-underscores to have Squid not reject hostnames with _ as
    part of their name. Squid by default rejects such names to conform with
    internet standards.  (this only adds the configure option to define
    ALLOW_HOSTNAME_UNDERSCORES, the code has been there since long back)

-----------------------------------------------------------------

Index: squid/acconfig.h
diff -u squid/acconfig.h:1.1.1.25.2.1 squid/acconfig.h:1.1.1.25.2.2
--- squid/acconfig.h:1.1.1.25.2.1	Sun Oct 24 21:19:45 1999
+++ squid/acconfig.h	Sun Oct 24 21:36:05 1999
@@ -237,6 +237,9 @@
 /* Default ICP port */
 #undef CACHE_ICP_PORT
 
+/* Allow _ in hostnames */
+#undef ALLOW_HOSTNAME_UNDERSCORES
+
 /*
  * we check for struct mallinfo
  */
Index: squid/configure
diff -u squid/configure:1.1.1.35.2.3 squid/configure:1.1.1.35.2.4
--- squid/configure:1.1.1.35.2.3	Sun Oct 24 21:24:46 1999
+++ squid/configure	Sun Oct 24 21:36:05 1999
@@ -87,6 +87,14 @@
   --disable-ident-lookups
                           This allows you to remove code that performs
                           Ident (RFC 931) lookups."
+ac_help="$ac_help
+  --enable-underscores
+                          Squid by default rejects any host names with _
+			  in their name to conform with internet standars.
+			  If you disagree with this you may allow _ in
+			  hostnames by using this switch, provided that
+			  the resolver library on the host where Squid runs
+			  does not reject _ in hostnames..."
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -1446,6 +1454,20 @@
   else
     cat >> confdefs.h <<\EOF
 #define USE_IDENT 1
+EOF
+
+  fi
+
+fi
+
+
+# Check whether --enable-underscores or --disable-underscores was given.
+if test "${enable_underscores+set}" = set; then
+  enableval="$enable_underscores"
+   if test "$enableval" = "yes" ; then
+    echo "Enabling the use of underscores in host names"
+    cat >> confdefs.h <<\EOF
+#define ALLOW_HOSTNAME_UNDERSCORES 1
 EOF
 
   fi
Index: squid/configure.in
diff -u squid/configure.in:1.1.1.37.2.4 squid/configure.in:1.1.1.37.2.5
--- squid/configure.in:1.1.1.37.2.4	Sun Oct 24 21:24:50 1999
+++ squid/configure.in	Sun Oct 24 21:36:08 1999
@@ -529,6 +529,21 @@
   fi
 ])
 
+dnl Enable underscore in hostnames
+AC_ARG_ENABLE(underscores,
+[  --enable-underscores
+                          Squid by default rejects any host names with _
+			  in their name to conform with internet standars.
+			  If you disagree with this you may allow _ in
+			  hostnames by using this switch, provided that
+			  the resolver library on the host where Squid runs
+			  does not reject _ in hostnames...],
+[ if test "$enableval" = "yes" ; then
+    echo "Enabling the use of underscores in host names"
+    AC_DEFINE(ALLOW_HOSTNAME_UNDERSCORES, 1)
+  fi
+])
+
 # Force some compilers to use ANSI features
 #
 case "$host" in
Index: squid/include/autoconf.h.in
diff -u squid/include/autoconf.h.in:1.1.1.30.2.2 squid/include/autoconf.h.in:1.1.1.30.2.3
--- squid/include/autoconf.h.in:1.1.1.30.2.2	Sun Oct 24 21:20:09 1999
+++ squid/include/autoconf.h.in	Sun Oct 24 21:36:15 1999
@@ -260,6 +260,9 @@
  */
 #undef HAVE_STRUCT_MALLINFO
 
+/* Allow _ in hostnames */
+#undef ALLOW_HOSTNAME_UNDERSCORES
+
 /* The number of bytes in a int.  */
 #undef SIZEOF_INT