Return-Path:
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 10968 invoked from network); 22 May 2010 11:27:45 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
by 140.211.11.9 with SMTP; 22 May 2010 11:27:45 -0000
Received: (qmail 73707 invoked by uid 500); 22 May 2010 11:27:45 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 73505 invoked by uid 500); 22 May 2010 11:27:42 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help:
list-unsubscribe:
List-Post:
List-Id:
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 73498 invoked by uid 99); 22 May 2010 11:27:41 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 May 2010 11:27:41 +0000
X-ASF-Spam-Status: No, hits=-1572.0 required=10.0
tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 May 2010 11:27:40 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
id BCB6223888FE; Sat, 22 May 2010 11:27:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r947280 - in /httpd/httpd/trunk/docs/manual: bind.html.en
bind.xml
Date: Sat, 22 May 2010 11:27:20 -0000
To: cvs@httpd.apache.org
From: rbowen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100522112720.BCB6223888FE@eris.apache.org>
Author: rbowen
Date: Sat May 22 11:27:20 2010
New Revision: 947280
URL: http://svn.apache.org/viewvc?rev=947280&view=rev
Log:
Minor tweaks in markup, phrasing.
Modified:
httpd/httpd/trunk/docs/manual/bind.html.en
httpd/httpd/trunk/docs/manual/bind.xml
Modified: httpd/httpd/trunk/docs/manual/bind.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.html.en?rev=947280&r1=947279&r2=947280&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.html.en (original)
+++ httpd/httpd/trunk/docs/manual/bind.html.en Sat May 22 11:27:20 2010
@@ -45,22 +45,26 @@
it listens to all addresses on the machine. However, it may need to
be told to listen on specific ports, or only on selected
addresses, or a combination of both. This is often combined with the
- Virtual Host feature, which determines how httpd responds to
- different IP addresses, hostnames and ports.
+ Virtual Host feature, which determines how
+ httpd
responds to different IP addresses, hostnames and
+ ports.
The Listen
directive tells the server to accept
- incoming requests only on the specified ports or
+ incoming requests only on the specified port(s) or
address-and-port combinations. If only a port number is
specified in the Listen
- directive, the server
- listens to the given port on all interfaces. If an IP address
- is given as well as a port, the server will listen on the given
- port and interface. Multiple Listen
directives may be used to
+ directive, the server listens to the given port on all interfaces.
+ If an IP address is given as well as a port, the server will listen
+ on the given port and interface. Multiple Listen
directives may be used to
specify a number of addresses and ports to listen on. The
server will respond to requests from any of the listed
addresses and ports.
+ Overlapping Listen
+ directives will result in a fatal error which will prevent the
+ server from starting up.
+
For example, to make the server accept connections on both
port 80 and port 8000, on all interfaces, use:
@@ -105,7 +109,7 @@
On the other hand, on some platforms, such as Linux and Tru64, the
only way to handle both IPv6 and IPv4 is to use
- mapped addresses. If you want httpd to handle IPv4 and IPv6 connections
+ mapped addresses. If you want httpd
to handle IPv4 and IPv6 connections
with a minimum of sockets, which requires using IPv4-mapped IPv6
addresses, specify the --enable-v4-mapped
configure
option.
Modified: httpd/httpd/trunk/docs/manual/bind.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/bind.xml?rev=947280&r1=947279&r2=947280&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/bind.xml (original)
+++ httpd/httpd/trunk/docs/manual/bind.xml Sat May 22 11:27:20 2010
@@ -51,23 +51,27 @@
it listens to all addresses on the machine. However, it may need to
be told to listen on specific ports, or only on selected
addresses, or a combination of both. This is often combined with the
- Virtual Host feature, which determines how httpd responds to
- different IP addresses, hostnames and ports.
+ Virtual Host feature, which determines how
+ httpd
responds to different IP addresses, hostnames and
+ ports.
The Listen
directive tells the server to accept
- incoming requests only on the specified ports or
+ incoming requests only on the specified port(s) or
address-and-port combinations. If only a port number is
specified in the Listen
- directive, the server
- listens to the given port on all interfaces. If an IP address
- is given as well as a port, the server will listen on the given
- port and interface. Multiple Listen directives may be used to
specify a number of addresses and ports to listen on. The
server will respond to requests from any of the listed
addresses and ports.
+ Overlapping Listen
+ directives will result in a fatal error which will prevent the
+ server from starting up.
+
For example, to make the server accept connections on both
port 80 and port 8000, on all interfaces, use:
@@ -112,7 +116,7 @@
On the other hand, on some platforms, such as Linux and Tru64, the
only way to handle both IPv6 and IPv4 is to use
- mapped addresses. If you want httpd to handle IPv4 and IPv6 connections
+ mapped addresses. If you want httpd
to handle IPv4 and IPv6 connections
with a minimum of sockets, which requires using IPv4-mapped IPv6
addresses, specify the --enable-v4-mapped
configure option.