From: André Malo Date: Sun, 28 Nov 2004 13:25:21 +0000 (+0000) Subject: use for programs X-Git-Tag: 2.1.2~74 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd5a98d46475e095bd3f10051d90acaaaee50109;p=thirdparty%2Fapache%2Fhttpd.git use for programs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106803 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/bind.xml b/docs/manual/bind.xml index 228c0ae6ba3..323850921fa 100644 --- a/docs/manual/bind.xml +++ b/docs/manual/bind.xml @@ -105,14 +105,15 @@ platforms but are disallowed by default on FreeBSD, NetBSD, and OpenBSD in order to match the system-wide policy on those platforms. But even on systems where it is disallowed by default, a - special configure parameter can change this behavior for Apache.

+ special configure parameter can change this behavior + for Apache.

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 with a minimum of sockets, which requires using IPv4-mapped IPv6 - addresses, specify the --enable-v4-mapped configure option.

+ addresses, specify the --enable-v4-mapped + configure option.

--enable-v4-mapped is the default on all platforms but FreeBSD, NetBSD, and OpenBSD, so this is probably how your Apache was @@ -130,10 +131,9 @@

If your platform supports it and you want Apache 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.

+ addresses), specify the --disable-v4-mapped + configure option. --disable-v4-mapped is the + default on FreeBSD, NetBSD, and OpenBSD.

diff --git a/docs/manual/dns-caveats.xml b/docs/manual/dns-caveats.xml index 0a21be31adf..b6f79d403d1 100644 --- a/docs/manual/dns-caveats.xml +++ b/docs/manual/dns-caveats.xml @@ -140,8 +140,8 @@

The addition of name-based virtual host support in Apache 1.1 requires Apache to know - the IP address(es) of the host that httpd is running on. To get - this address it uses either the global + the IP address(es) of the host that httpd + is running on. To get this address it uses either the global ServerName (if present) or calls the C function gethostname (which should return the same as typing "hostname" at the diff --git a/docs/manual/dso.xml b/docs/manual/dso.xml index b7a5da56a87..ad6e0b869d5 100644 --- a/docs/manual/dso.xml +++ b/docs/manual/dso.xml @@ -27,13 +27,13 @@

The Apache HTTP Server is a modular program where the administrator can choose the functionality to include in the server by selecting a set of modules. The modules can be - statically compiled into the httpd binary when the + statically compiled into the httpd binary when the server is built. Alternatively, modules can be compiled as Dynamic Shared Objects (DSOs) that exist separately from the - main httpd binary file. DSO modules may be + main httpd binary file. DSO modules may be compiled at the time the server is built, or they may be compiled and added at a later time using the Apache Extension - Tool (apxs).

+ Tool (apxs).

This document describes how to use DSO modules as well as the theory behind their use.

@@ -57,7 +57,7 @@ core which cannot be put into a DSO itself. Practically all other distributed Apache modules can then be placed into a DSO by individually enabling the DSO build for - them via configure's + them via configure's --enable-module=shared option as discussed in the install documentation. After a module is compiled into a DSO named mod_foo.so you @@ -68,14 +68,14 @@

To simplify this creation of DSO files for Apache modules (especially for third-party modules) a new support program - named apxs (APache - eXtenSion) is available. It can be used to build DSO based + named apxs (APache + eXtenSion) is available. It can be used to build DSO based modules outside of the Apache source tree. The idea is - simple: When installing Apache the configure's + simple: When installing Apache the configure's make install procedure installs the Apache C header files and puts the platform-dependent compiler and - linker flags for building DSO files into the apxs - program. This way the user can use apxs to compile + linker flags for building DSO files into the apxs + program. This way the user can use apxs to compile his Apache module sources without the Apache distribution source tree and without having to fiddle with the platform-dependent compiler and linker flags for DSO @@ -105,7 +105,10 @@ $ make install mod_foo.so: -$ ./configure --add-module=module_type:/path/to/3rdparty/mod_foo.c --enable-foo=shared
+$ ./configure --add-module=module_type:/path/to/3rdparty/mod_foo.c \
+ + --enable-foo=shared
+ $ make install @@ -124,7 +127,7 @@ $ make install Build and install a third-party Apache module, say mod_foo.c, into its own DSO mod_foo.so outside of the Apache - source tree using apxs: + source tree using apxs: $ cd /path/to/3rdparty
@@ -252,7 +255,7 @@ $ apxs -i -a -n foo mod_foo.la the actual server process can be assembled at run-time via LoadModule httpd.conf configuration commands instead of - configure options at build-time. For instance + configure options at build-time. For instance this way one is able to run different server instances (standard & SSL version, minimalistic & powered up version [mod_perl, PHP3], etc.) with only one Apache @@ -266,7 +269,7 @@ $ apxs -i -a -n foo mod_foo.la etc.

  • Easier Apache module prototyping because with the - DSO/apxs pair you can both work outside the + DSO/apxs pair you can both work outside the Apache source tree and only need an apxs -i command followed by an apachectl restart to bring a new version of your currently developed module into diff --git a/docs/manual/env.xml b/docs/manual/env.xml index 587c7014201..e65d3ebc94f 100644 --- a/docs/manual/env.xml +++ b/docs/manual/env.xml @@ -117,7 +117,7 @@
  • It is not possible to override or change the standard CGI variables using the environment manipulation directives.
    • -
  • When suexec is used to launch +
  • When suexec is used to launch CGI scripts, the environment will be cleaned down to a set of safe variables before CGI scripts are launched. The list of safe variables is defined at compile-time in diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index cc3045917f6..9646cd317c6 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -52,7 +52,7 @@ ref="module">module sources into Dynamic Shared Objects (DSOs) and helps install them in the Apache Web server.
    - See: Manual Page: apxs + See: Manual Page: apxs
    Authentication
    @@ -165,7 +165,7 @@
    Dynamic Shared Object (DSO)
    Modules compiled separately from the - Apache httpd binary that can be loaded on-demand.
    + Apache httpd binary that can be loaded on-demand.
    See: Dynamic Shared Object Support
    @@ -289,14 +289,15 @@
    Module
    An independent part of a program. Much of Apache's functionality is contained in modules that you can choose to include or exclude. Modules - that are compiled into the Apache httpd binary are called static - modules, while modules that are stored separately and can be - optionally loaded at run-time are called dynamic modules or - DSOs. Modules that are included by default - are called base modules. Many modules are available for Apache + that are compiled into the Apache httpd binary are + called static modules, while modules that are stored + separately and can be optionally loaded at run-time are called + dynamic modules or DSOs. + Modules that are included by default + are called base modules. Many modules are available for Apache that are not distributed as part of the Apache HTTP Server tarball. These are referred to as - third-party modules.
    + third-party modules.
    See: Module Index
    diff --git a/docs/manual/howto/auth.xml b/docs/manual/howto/auth.xml index 71a7dae274a..af047510d9e 100644 --- a/docs/manual/howto/auth.xml +++ b/docs/manual/howto/auth.xml @@ -105,16 +105,15 @@ might want to put the password file(s) in /usr/local/apache/passwd.

    -

    To create the file, use the htpasswd utility that came - with Apache. This will be located in the bin directory +

    To create the file, use the htpasswd utility that + came with Apache. This will be located in the bin directory of wherever you installed Apache. To create the file, type:

    htpasswd -c /usr/local/apache/passwd/passwords rbowen -

    htpasswd will ask you for the password, and +

    htpasswd will ask you for the password, and then ask you to type it again to confirm it:

    @@ -124,7 +123,7 @@ Adding password for user rbowen -

    If htpasswd is not in your path, of course +

    If htpasswd is not in your path, of course you'll have to type the full path to the file to get it to run. On my server, it's located at /usr/local/apache/bin/htpasswd

    @@ -178,14 +177,14 @@

    The AuthUserFile directive sets the path to the password file that we just - created with htpasswd. If you have a large number + created with htpasswd. If you have a large number of users, it can be quite slow to search through a plain text file to authenticate the user on each request. Apache also has the ability to store user information in fast database files. The mod_authn_dbm module provides the AuthDBMUserFile directive. These - files can be created and manipulated with the dbmmanage program. Many + files can be created and manipulated with the + dbmmanage program. Many other types of authentication options are available from third party modules in the Apache Modules diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml index 24fb9dadaaa..ca15385214b 100644 --- a/docs/manual/howto/cgi.xml +++ b/docs/manual/howto/cgi.xml @@ -400,11 +400,11 @@

    To check if you are using suexec, run apachectl -V and check for the location of SUEXEC_BIN. - If Apache finds an suexec binary there on startup, suexec will - be activated.

    + If Apache finds an suexec binary there on startup, + suexec will be activated.

    Unless you fully understand suexec, you should not be using it. - To disable suexec, simply remove (or rename) the suexec + To disable suexec, simply remove (or rename) the suexec binary pointed to by SUEXEC_BIN and then restart the server. If, after reading about suexec, you still wish to use it, then run suexec -V to find diff --git a/docs/manual/install.xml b/docs/manual/install.xml index ee398fa0cb7..8215f3b155f 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -148,18 +148,17 @@

    Perl 5 [OPTIONAL]
    -
    For some of the support scripts like apxs or dbmmanage (which are +
    For some of the support scripts like + apxs or dbmmanage (which are written in Perl) the Perl 5 interpreter is required (versions 5.003 or newer are sufficient). If no such interpreter is found by - the `configure' script there is no harm. Of course, you + the configure script there is no harm. Of course, you still can build and install Apache 2.0. Only those support scripts cannot be used. If you have multiple Perl interpreters installed (perhaps a Perl 4 from the vendor and a Perl 5 from your own), then it is recommended to use the --with-perl option (see below) to make sure the correct one is selected - by ./configure.
    + by configure.
    • @@ -206,8 +205,7 @@ $ tar xvf httpd-2_1_NN.tar

    The next step is to configure the Apache source tree for your particular platform and personal requirements. This is done using - the script configure included in + the script configure included in the root directory of the distribution. (Developers downloading the CVS version of the Apache source tree will need to have autoconf and libtool installed and will @@ -216,7 +214,7 @@ $ tar xvf httpd-2_1_NN.tar

    To configure the source tree using all the default options, simply type ./configure. To change the default - options, configure accepts a variety of variables + options, configure accepts a variety of variables and command line options.

    The most important option is the location --prefix @@ -241,15 +239,15 @@ $ tar xvf httpd-2_1_NN.tar --enable-module=shared. Similarly, you can disable Base modules with the --disable-module option. Be careful when - using these options, since configure cannot warn you + using these options, since configure cannot warn you if the module you specify does not exist; it will simply ignore the option.

    In addition, it is sometimes necessary to provide the - configure script with extra information about the + configure script with extra information about the location of your compiler, libraries, or header files. This is done by passing either environment variables or command line - options to configure. For more information, see the + options to configure. For more information, see the configure manual page.

    For a short impression of what possibilities you have, here @@ -266,7 +264,7 @@ $ tar xvf httpd-2_1_NN.tar --enable-speling=shared -

    When configure is run it will take several minutes to +

    When configure is run it will take several minutes to test for the availability of features on your system and build Makefiles which will later be used to compile the server.

    @@ -348,9 +346,9 @@ $ tar xvf httpd-2_1_NN.tar process will not overwrite any of your existing documents, log files, or configuration files. In addition, the developers make every effort to avoid incompatible changes in the - configure options, run-time configuration, or the + configure options, run-time configuration, or the module API between minor versions. In most cases you should be able to - use an identical configure command line, an identical + use an identical configure command line, an identical configuration file, and all of your modules should continue to work. (This is only valid for versions after 2.0.41; earlier versions have incompatible changes.)

    @@ -358,7 +356,7 @@ $ tar xvf httpd-2_1_NN.tar

    If you kept the source tree from your last installation, upgrading is even easier. The file config.nice in the root of the old source tree contains the exact - configure command line that you used to configure the + configure command line that you used to configure the source tree. Then to upgrade from one version to the next, you need only copy the config.nice file to the source tree of the new version, edit it to make any desired changes, and diff --git a/docs/manual/invoking.xml b/docs/manual/invoking.xml index 8f82e936176..0198ebbb340 100644 --- a/docs/manual/invoking.xml +++ b/docs/manual/invoking.xml @@ -31,15 +31,15 @@ and Running Apache as a Console Application.

    -

    On Unix, the httpd program +

    On Unix, the httpd program is run as a daemon that executes continuously in the background to handle requests. This document describes how - to invoke httpd.

    + to invoke httpd.

    Stopping and Restarting -httpd -apachectl +httpd +apachectl
    How Apache Starts @@ -55,18 +55,17 @@ run as a less privileged user. This is controlled by the selected Multi-Processing Module.

    -

    The recommended method of invoking the httpd - executable is to use the apachectl control script. This +

    The recommended method of invoking the httpd + executable is to use the apachectl control script. This script sets certain environment variables that are necessary for - httpd to function correctly under some operating - systems, and then invokes the httpd binary. - apachectl will pass through any command line - arguments, so any httpd options may also be used with - apachectl. You may also directly edit the - apachectl script by changing the HTTPD + httpd to function correctly under some operating + systems, and then invokes the httpd binary. + apachectl will pass through any command line + arguments, so any httpd options may also be used with + apachectl. You may also directly edit the + apachectl script by changing the HTTPD variable near the top to specify the correct location of the - httpd binary and any command-line arguments that you + httpd binary and any command-line arguments that you wish to be always present.

    The first thing that httpd does when it is @@ -114,27 +113,26 @@

    Starting at Boot-Time

    If you want your server to continue running after a system - reboot, you should add a call to apachectl to your + reboot, you should add a call to apachectl to your system startup files (typically rc.local or a file in an rc.N directory). This will start Apache as root. Before doing this ensure that your server is properly configured for security and access restrictions.

    -

    The apachectl script is designed to act like a +

    The apachectl script is designed to act like a standard SysV init script; it can take the arguments start, restart, and stop and translate them into the appropriate signals to - httpd. So you can often simply link - apachectl into the appropriate init directory. But be + httpd. So you can often simply link + apachectl into the appropriate init directory. But be sure to check the exact requirements of your system.

    Additional Information -

    Additional information about the command-line options of httpd and apachectl as well as other - support programs included with the server is available on the +

    Additional information about the command-line options of + httpd and apachectl as well as other support + programs included with the server is available on the Server and Supporting Programs page. There is also documentation on all the modules included with the Apache distribution diff --git a/docs/manual/logs.xml b/docs/manual/logs.xml index c24f74bb4b0..bfc9e3b4783 100644 --- a/docs/manual/logs.xml +++ b/docs/manual/logs.xml @@ -224,8 +224,7 @@ the hostname and log it in place of the IP address. However, this configuration is not recommended since it can significantly slow the server. Instead, it is best to use a - log post-processor such as logresolve to determine + log post-processor such as logresolve to determine the hostnames. The IP address reported here is not necessarily the address of the machine at which the user is sitting. If a proxy server exists between the user and the @@ -492,9 +491,8 @@

    One important use of piped logs is to allow log rotation without having to restart the server. The Apache HTTP Server - includes a simple program called rotatelogs for this - purpose. For example, to rotate the logs every 24 hours, you + includes a simple program called rotatelogs + for this purpose. For example, to rotate the logs every 24 hours, you can use:

    diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index 1e42c77308c..93ec6f7b220 100644 --- a/docs/manual/misc/perf-tuning.xml +++ b/docs/manual/misc/perf-tuning.xml @@ -126,7 +126,7 @@ DNS lookup to complete before the request is finished. In Apache 1.3 this setting defaults to Off. If you need to have addresses in your log files resolved to hostnames, use the - logresolve + logresolve program that comes with Apache, on one of the numerous log reporting packages which are available.

    @@ -736,7 +736,7 @@ semaphore API allows for a denial of service attack by any CGIs running under the same uid as the webserver (i.e., all CGIs, unless you use something like - suexec or cgiwrapper). For these + suexec or cgiwrapper). For these reasons this method is not used on any architecture except IRIX (where the previous two are prohibitively expensive on most IRIX boxes).

    diff --git a/docs/manual/misc/security_tips.xml b/docs/manual/misc/security_tips.xml index bd932e7b1b9..8652c71a5d8 100644 --- a/docs/manual/misc/security_tips.xml +++ b/docs/manual/misc/security_tips.xml @@ -75,8 +75,8 @@

    It is assumed that /, /usr, and /usr/local are only modifiable by - root. When you install the httpd executable, you should ensure that - it is similarly protected:

    + root. When you install the httpd executable, you + should ensure that it is similarly protected:

    cp httpd /usr/local/apache/bin
    @@ -91,9 +91,9 @@

    If you allow non-root users to modify any files that root either executes or writes on then you open your system to root compromises. - For example, someone could replace the httpd binary so that the next - time you start it, it will execute some arbitrary code. If the logs - directory is writeable (by a non-root user), someone could replace + For example, someone could replace the httpd binary so + that the next time you start it, it will execute some arbitrary code. If + the logs directory is writeable (by a non-root user), someone could replace a log file with a symlink to some other system file, and then root might overwrite that file with arbitrary data. If the log files themselves are writeable (by a non-root user), then someone may be diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 481c96de45f..b06ec964ef3 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -722,7 +722,7 @@ from the web -

    This directive sets the directory from which httpd +

    This directive sets the directory from which httpd will serve files. Unless matched by a directive like Alias, the server appends the path from the requested URL to the document root to make the @@ -756,7 +756,7 @@ Location FileInfo -

    This directive controls whether the httpd may use +

    This directive controls whether the httpd may use memory-mapping if it needs to read the contents of a file during delivery. By default, when the handling of a request requires access to the data within a file -- for example, when delivering a @@ -769,10 +769,10 @@ Location

    • On some multiprocessor systems, memory-mapping can reduce the - performance of the httpd.
      • + performance of the httpd.
    • With an NFS-mounted DocumentRoot, - the httpd may crash due to a segmentation fault if a file - is deleted or truncated while the httpd has it + the httpd may crash due to a segmentation fault if a file + is deleted or truncated while the httpd has it memory-mapped.
    @@ -808,8 +808,8 @@ Location Available in version 2.0.44 and later -

    This directive controls whether httpd may use the sendfile - support from the kernel to transmit file contents to the client. +

    This directive controls whether httpd may use the + sendfile support from the kernel to transmit file contents to the client. By default, when the handling of a request requires no access to the data within a file -- for example, when delivering a static file -- Apache uses sendfile to deliver the file contents @@ -1222,10 +1222,10 @@ MIME content-type don't have to suffer the extra latency that a lookup entails. Heavily loaded sites should leave this directive Off, since DNS lookups can take considerable - amounts of time. The utility logresolve, compiled by default - to the bin subdirectory of your installation directory, can - be used to look up host names from logged IP addresses offline.

    + amounts of time. The utility logresolve, compiled by + default to the bin subdirectory of your installation + directory, can be used to look up host names from logged IP addresses + offline.

     @@ -1264,7 +1264,7 @@ if a test is true at startup parameter-name is not defined.

    The parameter-name argument is a define as given on - the httpd command line via -Dparameter- + the httpd command line via -Dparameter- , at the time the server was started.

    IfDefine sections are @@ -1362,7 +1362,7 @@ the server configuration files rather than a file, Apache will read all files in that directory and any subdirectory. But including entire directories is not recommended, because it is easy to accidentally leave temporary - files in a directory that can cause httpd to + files in a directory that can cause httpd to fail.

    The file path specified may be an absolute path, or may be relative @@ -1396,7 +1396,7 @@ the server configuration files -apachectl +apachectl diff --git a/docs/manual/mod/leader.xml b/docs/manual/mod/leader.xml index 8f209ec8f5b..49881a51c91 100644 --- a/docs/manual/mod/leader.xml +++ b/docs/manual/mod/leader.xml @@ -40,15 +40,16 @@ MPM >http://deuce.doc.wustl.edu/doc/pspdfs/lf.pdf.

    To use the leader MPM, add - --with-mpm=leader to the configure script's - arguments when building the httpd.

    + --with-mpm=leader to the configure + script's arguments when building the httpd.

    This MPM depends on APR's atomic compare-and-swap operations for thread synchronization. If you are compiling for an x86 target and you don't need to support 386s, or you are compiling for a SPARC and you don't need to run on pre-UltraSPARC chips, add - --enable-nonportable-atomics=yes to the configure - script's arguments. This will cause APR to implement atomic operations + --enable-nonportable-atomics=yes to the + configure script's arguments. This will cause + APR to implement atomic operations using efficient opcodes not available in older CPUs.

    diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml index 91bbbc37c7b..f9cdedb1c37 100644 --- a/docs/manual/mod/mod_auth_digest.xml +++ b/docs/manual/mod/mod_auth_digest.xml @@ -51,7 +51,7 @@ URI(s) for this protection space.

    Appropriate user (text) files can be created using the - htdigest tool.

    + htdigest tool.

    Example: <Location /private/>
    diff --git a/docs/manual/mod/mod_authn_dbm.xml b/docs/manual/mod/mod_authn_dbm.xml index c1d1a038da7..1283a426d4b 100644 --- a/docs/manual/mod/mod_authn_dbm.xml +++ b/docs/manual/mod/mod_authn_dbm.xml @@ -88,7 +88,7 @@ passwords for authentication problem.

    A perl script called - dbmmanage is included with + dbmmanage is included with Apache. This program can be used to create and update DBM format password files for use with this module.

    diff --git a/docs/manual/mod/mod_authn_file.xml b/docs/manual/mod/mod_authn_file.xml index dc7a8f470d4..b4e7937274b 100644 --- a/docs/manual/mod/mod_authn_file.xml +++ b/docs/manual/mod/mod_authn_file.xml @@ -46,8 +46,8 @@ AuthDigestProvider -htpasswd -htdigest +htpasswd +htdigest AuthUserFile @@ -70,7 +70,7 @@ passwords for authentication ID is defined multiple times, mod_authn_file will use the first occurrence to verify the password.

    -

    The utility htpasswd +

    The utility htpasswd which is installed as part of the binary distribution, or which can be found in src/support, is used to maintain the password file for HTTP Basic Authentication. See the @@ -97,9 +97,9 @@ passwords for authentication module="mod_authn_dbm">AuthDBMUserFile should be used instead.

    -

    If you are using HTTP Digest Authentication, the htpasswd tool is not sufficient. - You have to use htdigest +

    If you are using HTTP Digest Authentication, the + htpasswd tool is not sufficient. + You have to use htdigest instead. Note that you cannot mix user data for Digest Authentication and Basic Authentication within the same file.

    diff --git a/docs/manual/mod/mod_authnz_ldap.xml b/docs/manual/mod/mod_authnz_ldap.xml index 52ff5e368f2..304a7ed863e 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml +++ b/docs/manual/mod/mod_authnz_ldap.xml @@ -850,7 +850,7 @@ environment variable

    Once a connection has been made to a server, that connection remains active for the life of the - httpd process, or until the LDAP server goes + httpd process, or until the LDAP server goes down.

    If the LDAP server goes down and breaks an existing diff --git a/docs/manual/mod/mod_cgi.xml b/docs/manual/mod/mod_cgi.xml index 9f8f232e2d7..c30b7edb376 100644 --- a/docs/manual/mod/mod_cgi.xml +++ b/docs/manual/mod/mod_cgi.xml @@ -62,7 +62,8 @@ Options ScriptAlias AddHandler -Running CGI programs under different user IDs +Running CGI programs under different + user IDs CGI Specification

    CGI Environment variables diff --git a/docs/manual/mod/mod_cgid.xml b/docs/manual/mod/mod_cgid.xml index 9860ac9f35c..530230cd170 100644 --- a/docs/manual/mod/mod_cgid.xml +++ b/docs/manual/mod/mod_cgid.xml @@ -56,7 +56,8 @@ mod_cgi -Running CGI programs under different user IDs +Running CGI programs under different + user IDs ScriptLog diff --git a/docs/manual/mod/mod_env.xml b/docs/manual/mod/mod_env.xml index 503a5c06497..25e60297ae2 100644 --- a/docs/manual/mod/mod_env.xml +++ b/docs/manual/mod/mod_env.xml @@ -30,8 +30,8 @@ SSI pages

    This module allows for control of the environment that will be provided to CGI scripts and SSI pages. Environment variables - may be passed from the shell which invoked the httpd process. - Alternatively, environment variables may be set or unset within + may be passed from the shell which invoked the httpd + process. Alternatively, environment variables may be set or unset within the configuration process.

     Environment Variables @@ -48,7 +48,7 @@ SSI pages

    Specifies one or more environment variables to pass to CGI scripts and SSI pages from the environment of the shell which - invoked the httpd process.

    + invoked the httpd process.

    Example PassEnv LD_LIBRARY_PATH diff --git a/docs/manual/mod/mod_example.xml b/docs/manual/mod/mod_example.xml index 3e1e0113ef2..e21d47fc32d 100644 --- a/docs/manual/mod/mod_example.xml +++ b/docs/manual/mod/mod_example.xml @@ -52,7 +52,7 @@
    1. - Run configure with --enable-example + Run configure with --enable-example option.
    2. Make the server (run "make").
      3. diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 50e5bf951fd..ed86cfe28f9 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -38,7 +38,7 @@ by other LDAP modules

      To enable this module, LDAP support must be compiled into apr-util. This is achieved by adding the --with-ldap - flag to the ./configure script when building + flag to the configure script when building Apache.

      SSL support requires that mod_ldap be linked @@ -174,9 +174,9 @@ by other LDAP modules

      By fetching the URL http://servername/cache-info, the administrator can get a status report of every cache that is used by mod_ldap cache. Note that if Apache does not - support shared memory, then each httpd instance has its + support shared memory, then each httpd instance has its own cache, so reloading the URL will result in different - information each time, depending on which httpd + information each time, depending on which httpd instance processes the request.

    diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index 6d86b72195e..f693737ae10 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -323,8 +323,8 @@ Security:

    If a program is used, then it will be run as the user who - started httpd. This will be root if the server was started by root; - be sure that the program is secure.

    + started httpd. This will be root if the server was + started by root; be sure that the program is secure.

     Note

    When entering a file path on non-Unix platforms, care should be taken diff --git a/docs/manual/mod/mod_log_forensic.xml b/docs/manual/mod/mod_log_forensic.xml index 3a10ec08d57..8133b343c63 100644 --- a/docs/manual/mod/mod_log_forensic.xml +++ b/docs/manual/mod/mod_log_forensic.xml @@ -127,9 +127,9 @@ version 2.1 Security:

    If a program is used, then it will be run as the user who - started httpd. This will be root if the server was started by root; - be sure that the program is secure or switches to a less privileged - user.

    + started httpd. This will be root if the server was + started by root; be sure that the program is secure or switches to a + less privileged user.

     Note diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 5ef341a50cf..9cf2ec91599 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -1467,7 +1467,7 @@ When using the NOT character mod_proxy.c is part of the ``httpd -l'' output. If yes, this functionality is available to mod_rewrite. If not, then you first have to - rebuild the ``httpd'' program with mod_proxy + rebuild the httpd program with mod_proxy enabled.

    diff --git a/docs/manual/mod/mod_suexec.xml b/docs/manual/mod/mod_suexec.xml index c426e4569ee..fc6ba4b87ac 100644 --- a/docs/manual/mod/mod_suexec.xml +++ b/docs/manual/mod/mod_suexec.xml @@ -31,8 +31,8 @@ and Group -

    This module, in combination with the suexec support program allows +

    This module, in combination with the + suexec support program allows CGI scripts to run as a specified user and Group.

     diff --git a/docs/manual/mod/mod_unique_id.xml b/docs/manual/mod/mod_unique_id.xml index 9c21d03879c..7231364721a 100644 --- a/docs/manual/mod/mod_unique_id.xml +++ b/docs/manual/mod/mod_unique_id.xml @@ -49,7 +49,7 @@ identifier for each request process requests one at a time. Each child can serve multiple requests in its lifetime. For the purpose of this discussion, the children don't share any data with each other. We'll refer - to the children as httpd processes.

    + to the children as httpd processes.

    Your website has one or more machines under your administrative control, together we'll call them a cluster of diff --git a/docs/manual/mod/mod_version.xml b/docs/manual/mod/mod_version.xml index ad2aa1aedfd..d64e6e2ce76 100644 --- a/docs/manual/mod/mod_version.xml +++ b/docs/manual/mod/mod_version.xml @@ -63,7 +63,8 @@

    The IfVersion section encloses - configuration directives which are executed only if the httpd version + configuration directives which are executed only if the + httpd version matches the desired criteria. For normal (numeric) comparisons the version argument has the format major[.minor[.patch]], e.g. diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index a70970fcc85..9189a576be5 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -200,7 +200,7 @@ requests

    Special note: Use of this directive in VirtualHost is no longer supported. To - configure your server for suexec use + configure your server for suexec use SuexecUserGroup.

    Note @@ -247,9 +247,8 @@ of the daemon href="../misc/security_tips.html#serverroot">security.

    Note -

    As of Apache 2 it is recommended to use only the apachectl script for - (re-)starting or stopping the server.

    +

    As of Apache 2 it is recommended to use only the + apachectl script for (re-)starting or stopping the server.

     @@ -934,7 +933,7 @@ requests

    Special note: Use of this directive in VirtualHost is no longer supported. To - configure your server for suexec use + configure your server for suexec use SuexecUserGroup.

    Note diff --git a/docs/manual/mod/perchild.xml b/docs/manual/mod/perchild.xml index 26b156a5c73..85ba386921a 100644 --- a/docs/manual/mod/perchild.xml +++ b/docs/manual/mod/perchild.xml @@ -78,9 +78,9 @@ uses set the privileges of the Apache child processes. The child processes must be able to read all the content that will be served, but should have as few privileges beyond that as - possible. In addition, unless suexec is used, these directives also - set the privileges which will be inherited by CGI scripts.

    + possible. In addition, unless suexec is used, + these directives also set the privileges which will be inherited + by CGI scripts.

    MaxRequestsPerChild controls how frequently the diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml index 80e2fbb080b..d210c626cfd 100644 --- a/docs/manual/mod/worker.xml +++ b/docs/manual/mod/worker.xml @@ -129,7 +129,7 @@ uses the privileges of the Apache child processes. The child processes must be able to read all the content that will be served, but should have as few privileges beyond that as possible. In - addition, unless suexec is used, + addition, unless suexec is used, these directives also set the privileges which will be inherited by CGI scripts.

    diff --git a/docs/manual/mpm.xml b/docs/manual/mpm.xml index 6d276b14052..9cfb3c28077 100644 --- a/docs/manual/mpm.xml +++ b/docs/manual/mpm.xml @@ -87,7 +87,7 @@ how they are used by the Apache HTTP Server.

    is chosen at configuration time and built into Apache.

    To actually choose the desired MPM, use the argument - --with-mpm= NAME with the ./configure script. + --with-mpm= NAME with the configure script. NAME is the name of the desired MPM.

    Once the server has been compiled, it is possible to diff --git a/docs/manual/new_features_2_2.xml b/docs/manual/new_features_2_2.xml index 50c84094aff..00c1284ca04 100644 --- a/docs/manual/new_features_2_2.xml +++ b/docs/manual/new_features_2_2.xml @@ -43,9 +43,9 @@

    Caching
    mod_cache, mod_disk_cache, and mod_mem_cache have undergone a lot of changes - are now considered production-quality. htcacheclean has been - introduced to cleanup mod_disk_cache setups.
    + are now considered production-quality. htcacheclean + has been introduced to cleanup mod_disk_cache + setups.
    Proxying
    The new mod_proxy_balancer module provides @@ -103,7 +103,7 @@
    A new hook, test_config has been added to aid modules that want to execute special code only when the user passes - -t to httpd.
    + -t to httpd.
    Set Threaded MPM's Stacksize
    diff --git a/docs/manual/platform/win_compiling.xml b/docs/manual/platform/win_compiling.xml index 9629a37723b..b0486c2ea86 100644 --- a/docs/manual/platform/win_compiling.xml +++ b/docs/manual/platform/win_compiling.xml @@ -231,7 +231,8 @@ nmake /f Makefile.win _apached

    Exported .mak files pose a greater hassle, but they are required for Visual C++ 5.0 users to build mod_ssl, - abs (ab with SSL support) and/or mod_deflate. + abs (ab with SSL support) and/or + mod_deflate. VC++ 7.0 (.net) users also benefit, nmake builds are faster than binenv builds. Build the entire project from within the VC++ 5.0 or 6.0 IDE, @@ -246,7 +247,7 @@ nmake /f Makefile.win _apached

    You must type this command from the top level - directory of the httpd source tree. Every + directory of the httpd source tree. Every .mak and .dep project file within the current directory and below will be corrected, and the timestamps adjusted to reflect the .dsp.

    diff --git a/docs/manual/programs/ab.xml b/docs/manual/programs/ab.xml index f6101d24439..f738cf2aeec 100644 --- a/docs/manual/programs/ab.xml +++ b/docs/manual/programs/ab.xml @@ -31,7 +31,7 @@ you how many requests per second your Apache installation is capable of serving.

    -httpd +httpd
    Synopsis

    ab diff --git a/docs/manual/programs/apachectl.xml b/docs/manual/programs/apachectl.xml index f9889ad6802..3a77ce65ee5 100644 --- a/docs/manual/programs/apachectl.xml +++ b/docs/manual/programs/apachectl.xml @@ -28,21 +28,21 @@

    apachectl is a front end to the Apache HyperText Transfer Protocol (HTTP) server. It is designed to help the administrator control the functioning of the Apache - httpd daemon.

    + httpd daemon.

    The apachectl script can operate in two modes. - First, it can act as a simple front-end to the httpd + First, it can act as a simple front-end to the httpd command that simply sets any necessary environment variables and - then invokes httpd, passing through any command line + then invokes httpd, passing through any command line arguments. Second, apachectl can act as a SysV init script, taking simple one-word arguments like start, restart, and stop, and translating them - into appropriate signals to httpd.

    + into appropriate signals to httpd.

    If your Apache installation uses non-standard paths, you will need to edit the apachectl script to set the - appropriate paths to the httpd binary. You can also - specify any necessary httpd command line arguments. + appropriate paths to the httpd binary. You can also + specify any necessary httpd command line arguments. See the comments in the script for details.

    The apachectl script returns a 0 exit value on @@ -53,12 +53,12 @@ Stopping Apache Configuration Files Platform Docs -httpd +httpd

    Synopsis

    When acting in pass-through mode, apachectl can take -all the arguments available for the httpd +all the arguments available for the httpd binary.

    apachectl [ httpd-argument ]

    @@ -73,24 +73,24 @@ one-word commands, defined below.

    Options

    Only the SysV init-style options are defined here. Other arguments -are defined on the httpd manual page.

    +are defined on the httpd manual page.

    start
    -
    Start the Apache httpd daemon. Gives an error if it +
    Start the Apache httpd daemon. Gives an error if it is already running. This is equivalent to apachectl -k start.
    stop
    -
    Stops the Apache httpd daemon. This is equivalent to +
    Stops the Apache httpd daemon. This is equivalent to apachectl -k stop.
    restart
    -
    Restarts the Apache httpd daemon. If the daemon is +
    Restarts the Apache httpd daemon. If the daemon is not running, it is started. This command automatically checks the configuration files as in configtest before initiating the restart to make sure the daemon doesn't die. This is equivalent @@ -113,7 +113,7 @@ currently being served is omitted.
    graceful
    -
    Gracefully restarts the Apache httpd daemon. If the +
    Gracefully restarts the Apache httpd daemon. If the daemon is not running, it is started. This differs from a normal restart in that currently open connections are not aborted. A side effect is that old log files will not be closed immediately. This diff --git a/docs/manual/programs/apxs.xml b/docs/manual/programs/apxs.xml index fd8cdccb2e1..cdb0cfd3a2d 100644 --- a/docs/manual/programs/apxs.xml +++ b/docs/manual/programs/apxs.xml @@ -33,7 +33,7 @@ directive from mod_so.

    So to use this extension mechanism your platform has to support the DSO - feature and your Apache httpd binary has to be built with the + feature and your Apache httpd binary has to be built with the mod_so module. The apxs tool automatically complains if this is not the case. You can check this yourself by manually running the command

    @@ -76,8 +76,8 @@ mod_so or perhaps even read the src/modules/standard/mod_so.c source file.

    -apachectl -httpd +apachectl +httpd
    Synopsis

    apxs -g diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml index eb4b58661ae..9f0acfedb3d 100644 --- a/docs/manual/programs/configure.xml +++ b/docs/manual/programs/configure.xml @@ -158,8 +158,8 @@ everything else is stored at sbindir. ==> clarify/change this -->

    --bindir=DIR
    Install user executables in DIR. The user executables - are supporting programs like htpasswd, - dbmmanage, etc. which are useful for site + are supporting programs like htpasswd, + dbmmanage, etc. which are useful for site administrators. By default DIR is set to EPREFIX/bin.
    @@ -209,10 +209,11 @@
    --sbindir=DIR
    Install the system administrator executables in DIR. - Those are server programs like httpd, - apachectl, suexec, etc. which are neccessary - to run the Apache HTTP Server. By default sbindir is - set to EPREFIX/sbin.
    + Those are server programs like httpd, + apachectl, suexec, etc. which + are neccessary to run the Apache HTTP Server. By default + sbindir is set to + EPREFIX/sbin.
    --sharedstatedir=DIR
    Install modifiable architecture-independent data in DIR. @@ -634,7 +635,7 @@ vendor's documentation.

    Note If you want to build a DSO module instead of a statically linked - use apxs. + use apxs.
    --with-mpm=MPM
    @@ -679,7 +680,7 @@
    --enable-modules=MODULE-LIST
    This option behaves similar to --enable-mods-shared, but will link the given modules statically. This mean, these modules - will always be present while running httpd. They need + will always be present while running httpd. They need not be loaded with LoadModule.
    @@ -687,8 +688,8 @@
    Allow IPv6 sockets to handle IPv4 connections.
    --with-port=PORT
    -
    This defines the port on which httpd will listen. This - port number is used when generating the configuration file +
    This defines the port on which httpd will listen. + This port number is used when generating the configuration file httpd.conf. The default is 80.
    --with-program-name
    @@ -724,7 +725,7 @@
    Specific packages
    --with-apr=DIR|FILE
    -
    The Apache Portable Runtime (APR) is part of the httpd +
    The Apache Portable Runtime (APR) is part of the httpd source distribution and will automatically be build together with the HTTP server. If you want to use an already installed APR instead you have to tell configure the path to the @@ -735,7 +736,7 @@
    --with-apr-util=DIR|FILE
    The Apache Portable Runtime Utilities (APU) are part of the - httpd source distribution and will automatically be build + httpd source distribution and will automatically be build together with the HTTP server. If you want to use an already installed APU instead you have to tell configure the path to the apu-config script. You may set the absolute path and name @@ -803,12 +804,12 @@ dynamically by default.
    --enable-suexec
    -
    Use this option to enable suexec, which allows you to set +
    Use this option to enable + suexec, which allows you to set uid and gid for spawned processes. Do not use this option unless you understand all the security implications of running a suid binary on your server. Further options - to configure suexec are described suexec are described below.

    It is possible to create a statically linked binary of a single @@ -816,8 +817,8 @@

    --enable-static-ab
    -
    Build a statically linked version of ab.
    +
    Build a statically linked version of + ab.
    --enable-static-checkgid
    @@ -828,25 +829,25 @@
    Build a statically linked version of htdbm.
    --enable-static-htdigest
    -
    Build a statically linked version of htdigest.
    +
    Build a statically linked version of + htdigest.
    --enable-static-htpasswd
    -
    Build a statically linked version of htpasswd.
    +
    Build a statically linked version of + htpasswd.
    --enable-static-logresolve
    -
    Build a statically linked version of logresolve.
    +
    Build a statically linked version of + logresolve.
    --enable-static-rotatelogs
    -
    Build a statically linked version of rotatelogs.
    +
    Build a statically linked version of + rotatelogs.
    suexec configuration options -

    The following options are used to fine tune the behavior of suexec. See The following options are used to fine tune the behavior of + suexec. See Configuring and installing suEXEC for further information.

    @@ -854,47 +855,47 @@
    --with-suexec-bin
    This defines the path to suexec binary. Default is --sbindir (see Fine - tuning of installation directories).
    + tuning of installation directories).
    --with-suexec-caller
    -
    This defines the user allowed to call suexec. It should - be the same as the user under which httpd normally - runs.
    +
    This defines the user allowed to call suexec. + It should be the same as the user under which httpd + normally runs.
    --with-suexec-docroot
    -
    This defines the directory tree under which suexec - access is allowed for executables. Default value is +
    This defines the directory tree under which + suexec access is allowed for executables. Default value is --datadir/htdocs.
    --with-suexec-gidmin
    Define this as the lowest GID allowed to be a target user for - suexec. The default value is 100.
    + suexec. The default value is 100.
    --with-suexec-logfile
    -
    This defines the filename of the suexec logfile. By - default the logfile is named suexec_log and located in +
    This defines the filename of the suexec logfile. + By default the logfile is named suexec_log and located in --logfiledir.
    --with-suexec-safepath
    Define the value of the environment variable PATH to - be set for processes started by suexec. Default value is - /usr/local/bin:/usr/bin:/bin.
    + be set for processes started by suexec. Default + value is /usr/local/bin:/usr/bin:/bin.
    --with-suexec-userdir
    This defines the subdirectory under the user's directory that - contains all executables for which suexec access is - allowed. This setting is necessary when you want to use - suexec together with user-specific directories (as + contains all executables for which suexec access + is allowed. This setting is necessary when you want to use + suexec together with user-specific directories (as provided by mod_userdir). The default is public_html.
    --with-suexec-uidmin
    Define this as the lowest UID allowed to be a target user for - suexec. The default value is 100.
    + suexec. The default value is 100.
    --with-suexec-umask
    -
    Set umask for processes started by suexec. - It defaults to your system settings.
    +
    Set umask for processes started by + suexec. It defaults to your system settings.
    diff --git a/docs/manual/programs/dbmmanage.xml b/docs/manual/programs/dbmmanage.xml index af7d6edac27..5d87500dd79 100644 --- a/docs/manual/programs/dbmmanage.xml +++ b/docs/manual/programs/dbmmanage.xml @@ -31,15 +31,15 @@ Resources available from the Apache HTTP server can be restricted to just the users listed in the files created by dbmmanage. This program can only be used when the usernames are stored in a DBM file. To - use a flat-file database see htpasswd.

    + use a flat-file database see htpasswd.

    This manual page only lists the command line arguments. For details of the directives necessary to configure user authentication in - httpd see the httpd manual, which is part of + httpd see the httpd manual, which is part of the Apache distribution or can be found at http://httpd.apache.org/.

    -httpd +httpd mod_authn_dbm mod_authz_dbm diff --git a/docs/manual/programs/htdigest.xml b/docs/manual/programs/htdigest.xml index 2823a868120..de8befc38dc 100644 --- a/docs/manual/programs/htdigest.xml +++ b/docs/manual/programs/htdigest.xml @@ -32,11 +32,11 @@

    This manual page only lists the command line arguments. For details of the directives necessary to configure digest authentication in - httpd see the Apache manual, which is part + httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd.apache.org/.

    -httpd +httpd mod_auth_digest
    Synopsis diff --git a/docs/manual/programs/htpasswd.xml b/docs/manual/programs/htpasswd.xml index 89993b1ef90..4808ad2dd9c 100644 --- a/docs/manual/programs/htpasswd.xml +++ b/docs/manual/programs/htpasswd.xml @@ -35,8 +35,7 @@ just the users listed in the files created by htpasswd. This program can only manage usernames and passwords stored in a flat-file. It can encrypt and display password information for use in other types of data - stores, though. To use a DBM database see dbmmanage.

    + stores, though. To use a DBM database see dbmmanage.

    htpasswd encrypts passwords using either a version of MD5 modified for Apache, or the system's crypt() routine. Files @@ -46,11 +45,11 @@

    This manual page only lists the command line arguments. For details of the directives necessary to configure user authentication in - httpd see the Apache manual, which is part of the + httpd see the Apache manual, which is part of the Apache distribution or can be found at http://httpd.apache.org/.

    -httpd +httpd The scripts in support/SHA1 which come with the distribution. @@ -110,7 +109,7 @@ distribution.
    Use crypt() encryption for passwords. The default on all platforms but Windows, Netware and TPF. Though possibly supported by htpasswd on all platforms, it is not supported by the - httpd server on Windows, Netware and TPF.
    + httpd server on Windows, Netware and TPF.
    -s
    Use SHA encryption for passwords. Facilitates migration from/to Netscape @@ -118,7 +117,7 @@ distribution.
    -p
    Use plaintext passwords. Though htpasswd will support - creation on all platforms, the httpd daemon will + creation on all platforms, the httpd daemon will only accept plain text passwords on Windows, Netware and TPF.
    -D
    diff --git a/docs/manual/programs/httpd.xml b/docs/manual/programs/httpd.xml index 2d37fe102bb..0997af7963d 100644 --- a/docs/manual/programs/httpd.xml +++ b/docs/manual/programs/httpd.xml @@ -31,8 +31,8 @@ child processes or threads to handle requests.

    In general, httpd should not be invoked directly, - but rather should be invoked via apachectl on Unix-based systems or + apachectl on Unix-based systems or as a service on Windows NT, 2000 and XP and as a console application on Windows 9x and ME.

    @@ -42,7 +42,7 @@ Stopping Apache Configuration Files Platform-specific Documentation -apachectl +apachectl
    Synopsis

    httpd [ -d diff --git a/docs/manual/programs/index.xml b/docs/manual/programs/index.xml index c4b98b0a34d..e3c7eb96d2a 100644 --- a/docs/manual/programs/index.xml +++ b/docs/manual/programs/index.xml @@ -32,54 +32,54 @@

    Index
    -
    httpd
    +
    httpd
    Apache hypertext transfer protocol server
    -
    apachectl
    +
    apachectl
    Apache HTTP server control interface
    -
    ab
    +
    ab
    Apache HTTP server benchmarking tool
    -
    apxs
    +
    apxs
    APache eXtenSion tool
    -
    configure
    +
    configure
    Configure the source tree
    -
    dbmmanage
    +
    dbmmanage
    Create and update user authentication files in DBM format for basic authentication
    -
    htcacheclean
    +
    htcacheclean
    Clean up the disk cache
    -
    htdigest
    +
    htdigest
    Create and update user authentication files for digest authentication
    -
    htpasswd
    +
    htpasswd
    Create and update user authentication files for basic authentication
    -
    logresolve
    +
    logresolve
    Resolve hostnames for IP-addresses in Apache logfiles
    -
    rotatelogs
    +
    rotatelogs
    Rotate Apache logs without having to kill the server
    -
    suexec
    +
    suexec
    Switch User For Exec
    diff --git a/docs/manual/sections.xml b/docs/manual/sections.xml index f3603688f51..df67c90b60b 100644 --- a/docs/manual/sections.xml +++ b/docs/manual/sections.xml @@ -65,7 +65,7 @@ enclosed directives will be ignored.

    The IfDefine directive encloses directives that will only be applied if an appropriate -parameter is defined on the httpd command line. For example, +parameter is defined on the httpd command line. For example, with the following configuration, all requests will be redirected to another site only if the server is started using httpd -DClosedForNow:

    diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml index c679fe34150..50d55703dbf 100644 --- a/docs/manual/ssl/ssl_faq.xml +++ b/docs/manual/ssl/ssl_faq.xml @@ -266,9 +266,9 @@ author.

    Why do I get ``Connection Refused'' messages when trying to access my freshly installed Apache+mod_ssl server via HTTPS?

    There can be various reasons. Some of the common mistakes is that people - start Apache with just ``apachectl start'' (or - ``httpd'') instead of ``apachectl startssl'' (or - ``httpd -DSSL''. Or you're configuration is not correct. At + start Apache with just apachectl start (or + httpd) instead of apachectl startssl (or + httpd -DSSL. Or you're configuration is not correct. At least make sure that your Listen directives match your VirtualHost directives. And if all fails, please do yourself a favor and start over with the @@ -952,17 +952,17 @@ server" What's the reason?

    Apache and OpenSSL version information
    The Apache version can be determined - by running ``httpd -v''. The OpenSSL version can be - determined by running ``openssl version''. Alternatively when - you have Lynx installed you can run the command ``lynx -mime_header - http://localhost/ | grep Server'' to determine all information in a + by running httpd -v. The OpenSSL version can be + determined by running openssl version. Alternatively when + you have Lynx installed you can run the command lynx -mime_header + http://localhost/ | grep Server to determine all information in a single step.
    The details on how you built and installed Apache+mod_ssl+OpenSSL
    For this you can provide a logfile of your terminal session which shows the configuration and install steps. Alternatively you can at least - provide the configure command line you used. + provide the configure command line you used.
    In case of core dumps please include a Backtrace
    @@ -1007,7 +1007,7 @@ server" What's the reason? most "current" kernels do not allow a process to dump core after it has done a setuid() (unless it does an exec()) for security reasons (there can be privileged information left over in - memory). Additionally you can run ``/path/to/httpd -X'' + memory). Additionally you can run /path/to/httpd -X manually to force Apache to not fork. diff --git a/docs/manual/stopping.xml b/docs/manual/stopping.xml index cf492e74755..bd08ca6276d 100644 --- a/docs/manual/stopping.xml +++ b/docs/manual/stopping.xml @@ -33,16 +33,16 @@ Apache on those platforms.

    -httpd -apachectl +httpd +apachectl
    Introduction

    In order to stop or restart Apache, you must send a signal to - the running httpd processes. There are two ways to + the running httpd processes. There are two ways to send the signals. First, you can use the unix kill command to directly send signals to the processes. You will - notice many httpd executables running on your system, + notice many httpd executables running on your system, but you should not send signals to any of them except the parent, whose pid is in the PidFile. That is to say you @@ -58,16 +58,15 @@ kill -TERM `cat /usr/local/apache2/logs/httpd.pid` -

    The second method of signaling the httpd processes +

    The second method of signaling the httpd processes is to use the -k command line options: stop, restart, and graceful, - as described below. These are arguments to the httpd binary, but we recommend that - you send them using the apachectl control script, which - will pass them through to httpd.

    + as described below. These are arguments to the + httpd binary, but we recommend that + you send them using the apachectl control script, which + will pass them through to httpd.

    -

    After you have signaled httpd, you can read about +

    After you have signaled httpd, you can read about its progress by issuing:

    tail -f /usr/local/apache2/logs/error_log @@ -153,15 +152,14 @@ attempt to restart the server -- it will not be able to bind to its listening ports. Before doing a restart, you can check the syntax of the configuration files with the -t - command line argument (see httpd). This still will not + command line argument (see httpd). This still will not guarantee that the server will restart correctly. To check the semantics of the configuration files as well as the syntax, you - can try starting httpd as a non-root user. If there are no - errors it will attempt to open its sockets and logs and fail - because it's not root (or because the currently running httpd - already has those ports bound). If it fails for any other - reason then it's probably a config file error and the error + can try starting httpd as a non-root user. If there + are no errors it will attempt to open its sockets and logs and fail + because it's not root (or because the currently running + httpd already has those ports bound). If it fails + for any other reason then it's probably a config file error and the error should be fixed before issuing the graceful restart.
    diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index 9b2ca535fd7..761b2b8230f 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -446,7 +446,8 @@

    Setting paranoid permissions
    Although the suEXEC wrapper will check to ensure that its caller is the correct user as specified with the - --with-suexec-caller configure option, there is + --with-suexec-caller configure + option, there is always the possibility that a system or library call suEXEC uses before this check may be exploitable on your system. To counter this, and because it is best-practise in general, you should use @@ -460,7 +461,7 @@ Group webgroup
    -

    and suexec is installed at +

    and suexec is installed at "/usr/local/apache2/sbin/suexec", you should run:

    @@ -476,14 +477,14 @@ suEXEC

    Upon startup of Apache, it looks for the file - suexec in the directory defined by the + suexec in the directory defined by the --sbindir option (default is "/usr/local/apache/sbin/suexec"). If Apache finds a properly configured suEXEC wrapper, it will print the following message to the error log:

    - [notice] suEXEC mechanism enabled (wrapper: /path/to/suexec) + [notice] suEXEC mechanism enabled (wrapper: /path/to/suexec)

    If you don't see this message at server startup, the server is @@ -495,7 +496,7 @@ restart Apache. Restarting it with a simple HUP or USR1 signal will not be enough.

    If you want to disable suEXEC you should kill and restart - Apache after you have removed the suexec file.

    + Apache after you have removed the suexec file.

    Using suEXEC diff --git a/docs/manual/vhosts/details.xml b/docs/manual/vhosts/details.xml index d5cdc9d1545..dafac16e0da 100644 --- a/docs/manual/vhosts/details.xml +++ b/docs/manual/vhosts/details.xml @@ -213,8 +213,8 @@ vhost definition.

    If the main_server has no ServerName at this - point, then the hostname of the machine that httpd is running - on is used instead. We will call the main_server address + point, then the hostname of the machine that httpd + is running on is used instead. We will call the main_server address set those IP addresses returned by a DNS lookup on the ServerName of the main_server.

    diff --git a/docs/manual/vhosts/index.xml b/docs/manual/vhosts/index.xml index 62d39f973ae..0ed271f68b7 100644 --- a/docs/manual/vhosts/index.xml +++ b/docs/manual/vhosts/index.xml @@ -98,8 +98,8 @@ hosts

    This command will dump out a description of how Apache parsed the configuration file. Careful examination of the IP addresses and - server names may help uncover configuration mistakes. (See the docs for the httpd program for + server names may help uncover configuration mistakes. (See + the docs for the httpd program for other command line options)

    diff --git a/docs/manual/vhosts/ip-based.xml b/docs/manual/vhosts/ip-based.xml index 772e912b623..762cb45e611 100644 --- a/docs/manual/vhosts/ip-based.xml +++ b/docs/manual/vhosts/ip-based.xml @@ -43,8 +43,8 @@
    How to set up Apache

    There are two ways of configuring apache to support multiple - hosts. Either by running a separate httpd daemon for each - hostname, or by running a single daemon which supports all the + hosts. Either by running a separate httpd daemon for + each hostname, or by running a single daemon which supports all the virtual hosts.

    Use multiple daemons when:

    @@ -66,7 +66,7 @@ address, or to specific addresses. So if you have a need to listen to a specific address for whatever reason, then you will need to listen to all specific addresses. (Although one - httpd could listen to N-1 of the addresses, and another could + httpd could listen to N-1 of the addresses, and another could listen to the remaining address.) @@ -85,8 +85,8 @@
    Setting up multiple daemons -

    Create a separate httpd installation for each virtual host. For - each installation, use the Create a separate httpd installation for each + virtual host. For each installation, use the Listen directive in the configuration file to select which IP address (or virtual host) that daemon services. e.g.

    @@ -103,8 +103,8 @@
    Setting up a single daemon with virtual hosts -

    For this case, a single httpd will service requests for the - main server and all the virtual hosts. The For this case, a single httpd will service + requests for the main server and all the virtual hosts. The VirtualHost directive in the configuration file is used to set the values of ServerAdmin,