[PATCH] [resend] Remove unneccessary IPv6 autoconf-fu

[Colm MacCarthaigh <co...@stdlib.net>]

----- Forwarded message from Colm MacCarthaigh <co...@stdlib.net> -----

From: Colm MacCarthaigh <co...@stdlib.net>
Reply-To: colm@stdlib.net
Date: Mon, 1 Sep 2003 16:22:13 +0100
To: dev@httpd.apache.org
Subject: [Patch] remove unneccessary IPv6 autoconf-fu


"Listen 80" just works now, using v4-only, v6-only, mapped address
or non-mapped addresses.

Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.254
diff -u -u -r1.254 configure.in
--- configure.in	21 Jul 2003 14:48:01 -0000	1.254
+++ configure.in	1 Sep 2003 15:20:21 -0000
@@ -360,16 +360,9 @@
 esac
 ])
 
-if test $v4mapped = "yes" -o $ac_cv_define_APR_HAVE_IPV6 = "no"; then
-    nonssl_listen_stmt_1=""
-    nonssl_listen_stmt_2="Listen @@Port@@"
-    if test $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
-        AC_DEFINE(AP_ENABLE_V4_MAPPED, 1,
-                  [Allow IPv4 connections on IPv6 listening sockets])
-    fi
-else
-    nonssl_listen_stmt_1="Listen 0.0.0.0:@@Port@@"
-    nonssl_listen_stmt_2="Listen [[::]]:@@Port@@"
+if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
+    AC_DEFINE(AP_ENABLE_V4_MAPPED, 1,
+              [Allow IPv4 connections on IPv6 listening sockets])
 fi
 
 AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging and compile time warnings),
Index: docs/conf/httpd-std.conf.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/docs/conf/httpd-std.conf.in,v
retrieving revision 1.54
diff -u -u -r1.54 httpd-std.conf.in
--- docs/conf/httpd-std.conf.in	29 Jul 2003 20:17:07 -0000	1.54
+++ docs/conf/httpd-std.conf.in	1 Sep 2003 15:20:21 -0000
@@ -214,8 +214,7 @@
 # prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
 #
 #Listen 12.34.56.78:80
-@nonssl_listen_stmt_1@
-@nonssl_listen_stmt_2@
+Listen @@Port@@
 
 #
 # Dynamic Shared Object (DSO) Support
-- 
Colm MacCárthaigh                        Public Key: colm+pgp@stdlib.net
colm@stdlib.net					  http://www.stdlib.net/

----- End forwarded message -----

-- 
Colm MacCárthaigh                        Public Key: colm+pgp@stdlib.net
colm@stdlib.net					  http://www.stdlib.net/