"Listen 80" just works now, using v4-only, v6-only, mapped address

or non-mapped address.

Submitted by:	Colm MacCarthaigh <colm@stdlib.net>

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

diff --git a/configure.in b/configure.in
index 2a3ba8fdeb4d601662538a162ff87f6675b3dca6..e930890fc210d1a1ec6b381c36d71b9db43e9242 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -360,16 +360,9 @@ AC_ARG_ENABLE(v4-mapped,APACHE_HELP_STRING(--enable-v4-mapped,Allow IPv6 sockets
 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),

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 82b25d887f068bdb68a36f5911e7183ebe09a8f4..a0abcc310da0d1d59fdb105ac831e0df521e6474 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -214,8 +214,7 @@ KeepAliveTimeout 15
 # 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