From 65ef50f74e42e70342f149c68399dfd500f5522e Mon Sep 17 00:00:00 2001 From: Rich Bowen Date: Fri, 12 Mar 2010 12:26:09 +0000 Subject: [PATCH] 'Apache' -> 'Apache HTTP Server' or 'httpd' git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@922236 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/bind.html.en | 20 ++++++++++---------- docs/manual/bind.xml | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/manual/bind.html.en b/docs/manual/bind.html.en index 46349df2ff..1adf4b6007 100644 --- a/docs/manual/bind.html.en +++ b/docs/manual/bind.html.en @@ -26,7 +26,7 @@  tr 

-

Configuring Apache to listen on specific addresses and ports.

+

Configuring Apache HTTP Server (httpd) to listen on specific addresses and ports.

-

If your platform supports it and you want Apache to handle IPv4 and +

If your platform supports it and you want httpd to handle IPv4 and IPv6 connections on separate sockets (i.e., to disable IPv4-mapped addresses), specify the --disable-v4-mapped configure option. --disable-v4-mapped is the default on FreeBSD, NetBSD, and OpenBSD.

diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 4fe8618b12..3604cf3304 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -25,7 +25,7 @@ Binding -

Configuring Apache to listen on specific addresses and ports.

+

Configuring Apache HTTP Server (httpd) to listen on specific addresses and ports.

Virtual Hosts @@ -46,12 +46,12 @@ -

When Apache starts, it binds to some port and address on +

When httpd starts, it binds to some port and address on the local machine and waits for incoming requests. By default, 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 Apache responds to + Virtual Host feature, which determines how httpd responds to different IP addresses, hostnames and ports.

The Listen @@ -97,10 +97,10 @@

A growing number of platforms implement IPv6, and APR supports IPv6 on most of these platforms, - allowing Apache to allocate IPv6 sockets, and to handle requests sent + allowing httpd to allocate IPv6 sockets, and to handle requests sent over IPv6.

-

One complicating factor for Apache administrators is whether or +

One complicating factor for httpd administrators is whether or not an IPv6 socket can handle both IPv4 connections and IPv6 connections. Handling IPv4 connections with an IPv6 socket uses IPv4-mapped IPv6 addresses, which are allowed by default on most @@ -108,20 +108,20 @@ OpenBSD, in order to match the system-wide policy on those platforms. On systems where it is disallowed by default, a special configure parameter can change this behavior - for Apache.

+ for httpd.

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 Apache 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.

--enable-v4-mapped is the default on all platforms except - FreeBSD, NetBSD, and OpenBSD, so this is probably how your Apache was + FreeBSD, NetBSD, and OpenBSD, so this is probably how your httpd was built.

-

If you want Apache to handle IPv4 connections only, regardless of +

If you want httpd to handle IPv4 connections only, regardless of what your platform and APR will support, specify an IPv4 address on all Listen directives, as in the following examples:

@@ -131,7 +131,7 @@ Listen 192.0.2.1:80 -

If your platform supports it and you want Apache to handle IPv4 and +

If your platform supports it and you want httpd to handle IPv4 and IPv6 connections on separate sockets (i.e., to disable IPv4-mapped addresses), specify the --disable-v4-mapped configure option. --disable-v4-mapped is the -- 2.40.0