You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/01/23 14:22:09 UTC
svn commit: r1560680 - in /httpd/httpd/branches/2.4.x: ./
docs/conf/extra/httpd-ssl.conf.in
Author: trawick
Date: Thu Jan 23 13:22:08 2014
New Revision: 1560680
URL: http://svn.apache.org/r1560680
Log:
merge r1560679 from trunk:
httpd allocates separate AF_INET/AF_INET6 sockets automatically
when v4-mapped addresses are disabled
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1560679
Modified: httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in?rev=1560680&r1=1560679&r2=1560680&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in (original)
+++ httpd/httpd/branches/2.4.x/docs/conf/extra/httpd-ssl.conf.in Thu Jan 23 13:22:08 2014
@@ -33,9 +33,6 @@
# When we also provide SSL we have to listen to the
# standard HTTP port (see above) and to the HTTPS port
#
-# Note: Configurations that use IPv6 but not IPv4-mapped addresses need two
-# Listen directives: "Listen [::]:@@SSLPort@@" and "Listen 0.0.0.0:@@SSLPort@@"
-#
Listen @@SSLPort@@
##