From: Cliff Woolley <jwoolley@apache.org>
Date: Sun, 28 Sep 2003 16:27:24 +0000 (+0000)
Subject: "Listen 80" just works now, using v4-only, v6-only, mapped address
X-Git-Tag: pre_ajp_proxy~1137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05bbc35eb09798cb8fec59aec19e0b38a7c0b468;p=apache

"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 2a3ba8fdeb..e930890fc2 100644
--- 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 82b25d887f..a0abcc310d 100644
--- 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