From: Andre Malo Date: Tue, 28 Jan 2014 22:59:24 +0000 (+0000) Subject: - fix various internal links, directive and module references X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9e8ef60eb57622eb6cf6a5dce0551ad89ea982d;p=thirdparty%2Fapache%2Fhttpd.git - fix various internal links, directive and module references - add missing documents to the sitemap (if it's not in the sitemap, it's not going into any of the offline formats) - fix a few metafile references (d'oh) - fix some typos along the way git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1562300 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/misc/perf-scaling.xml b/docs/manual/misc/perf-scaling.xml index 833acdc3258..6fcb818da00 100644 --- a/docs/manual/misc/perf-scaling.xml +++ b/docs/manual/misc/perf-scaling.xml @@ -20,9 +20,9 @@ limitations under the License. --> - - Performance Scaling - + Miscellaneous Documentation + + Performance Scaling @@ -747,7 +747,7 @@ Swap: 3903784 12540 3891244 MPM runs a smaller number of child processes, and spawns multiple request handling threads within each child process. In 2.4 MPMs are no longer hard-wired. They too can be exchanged - via LoadModule. + via LoadModule. The default MPM in 2.4 is the event MPM.

The maximum number of workers, be they pre-forked child @@ -762,7 +762,7 @@ Swap: 3903784 12540 3891244

Finally, if the httpd server in question is not executing any third-party code, via mod_php, mod_perl or similar, - we recommend the use of mpm_event. This MPM is ideal + we recommend the use of mpm_event. This MPM is ideal for situations where httpd serves as a thin layer between clients and backend servers doing the real job, such as a proxy or cache.

@@ -772,8 +772,7 @@ Swap: 3903784 12540 3891244 MaxClients

- The MaxClients - + The MaxClients directive in your Apache httpd configuration file specifies the maximum number of workers your server can create. It has two related directives, MinSpareServers @@ -799,8 +798,7 @@ Swap: 3903784 12540 3891244 complicated. Threaded MPMs support the ThreadsPerChild - directive1 . Apache requires that MaxClients - + directive1 . Apache requires that MaxClients is evenly divisible by ThreadsPerChild .If you set either directive to a number that doesn't @@ -808,10 +806,8 @@ Swap: 3903784 12540 3891244 complaint to the error log and adjust the ThreadsPerChild - value downwards until it is an even factor of - MaxClients - - . + value downwards until it is an even factor of + MaxClients.

@@ -823,7 +819,7 @@ Swap: 3903784 12540 3891244 that all the memory on your system is used, but no more. If your system gets so overloaded that it needs to heavily swap core memory out to disk, performance will degrade - quickly. The formula for determining MaxClients + quickly. The formula for determining MaxClients is fairly simple:

@@ -1372,21 +1368,22 @@ Listen *:8001

- The Apache Software Foundation Wiki is served by MoinMoin. - MoinMoin is written in Python and runs as a CGI. To date, any - attempts to run it under mod_python has been unsuccessful. - The CGI proved to place an untenably high load on the - server machine, especially when the Wiki was being indexed - by search engines like Google. To lighten the load on the - server machine, the Apache Infrastructure team turned to - mod_cache. It turned out MoinMoin - - needed a small patch to ensure proper behavior behind the - caching server: certain requests can never be cached and - the corresponding Python modules were patched to send the - proper HTTP response headers. After this modification, the - cache in front of the Wiki was enabled with the following - configuration snippet in httpd.conf: + The Apache Software Foundation Wiki is served by + MoinMoin. MoinMoin is written in Python and runs as + a CGI. To date, any attempts to run it under + mod_python has been unsuccessful. The CGI proved to + place an untenably high load on the server machine, + especially when the Wiki was being indexed by search + engines like Google. To lighten the load on the + server machine, the Apache Infrastructure team + turned to mod_cache. It turned out MoinMoin needed a + small patch to ensure proper behavior behind the + caching server: certain requests can never be cached + and the corresponding Python modules were patched to + send the proper HTTP response headers. After this + modification, the cache in front of the Wiki was + enabled with the following configuration snippet in + httpd.conf:

@@ -1400,7 +1397,7 @@ CacheMaxExpire 21600

This configuration will try to cache any and all content within its virtual host. It will never cache content for - more than six hours (the CacheMaxExpire + more than six hours (the CacheMaxExpire directive). If no Expires: header is present in the response, mod_cache will compute an expiration period from the Last-Modified: diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 29ff3d80c48..afafcaa328c 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -889,7 +889,7 @@ the contents of file-system directories matching a regular expression.From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of paths to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

@@ -1752,14 +1752,14 @@ filenames

From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of files to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-<FileMatch ^(?<sitename>[^/]+)> +<FilesMatch ^(?<sitename>[^/]+)> require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example -</FileMatch> +</FilesMatch> @@ -1915,7 +1915,7 @@ satisfied by a request at runtime documentation is available in Expressions in Apache HTTP Server.

-

Only directives that support the Only directives that support the directory context can be used within this configuration section.

@@ -2718,7 +2718,7 @@ matching URLs

From 2.4.8 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of URLs to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 74a8226690e..d0adb3a3ae0 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -532,7 +532,7 @@ proxied resources

From 2.5.0 onwards, named groups and backreferences are captured and written to the environment with the corresponding name prefixed with "MATCH_" and in upper case. This allows elements of URLs to be referenced - from within expressions and modules like + from within expressions and modules like mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 308dc53198d..d0aa4a3ca65 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -193,7 +193,7 @@ URLs on the fly is used in VirtualHost or server context with version 2.2.22 or later of httpd, mod_rewrite will only process the rewrite rules if the request URI is a URL-path. This avoids + href="directive-dict.html#Syntax">URL-path. This avoids some security issues where particular rules could allow "surprising" pattern expansions (see CVE-2011-3368 @@ -947,8 +947,8 @@ RewriteRule ^/$ /homepage.std.html [L]

Pattern is a perl compatible regular expression. On the first RewriteRule, it is matched against - the (%-decoded) URL-path (or - file-path, depending + the (%-decoded) URL-path (or + file-path, depending on the context) of the request. Subsequent patterns are matched against the output of the last matching RewriteRule.

diff --git a/docs/manual/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml index e4f70e88908..c5fd0f17464 100644 --- a/docs/manual/mod/mpmt_os2.xml +++ b/docs/manual/mod/mpmt_os2.xml @@ -47,9 +47,9 @@ Setting which addresses and ports Apache uses -User +User -Group +Group Listen diff --git a/docs/manual/platform/netware.xml b/docs/manual/platform/netware.xml index 39e16edf889..258b80e08e8 100644 --- a/docs/manual/platform/netware.xml +++ b/docs/manual/platform/netware.xml @@ -33,14 +33,17 @@ bug reporting page.

-

The bug reporting page and dev-httpd mailing list are not - provided to answer questions about configuration or running Apache. - Before you submit a bug report or request, first consult this document, the - Frequently Asked Questions page and the other - relevant documentation topics. If you still have a question or problem, - post it to the - novell.devsup.webserver newsgroup, where many Apache users are more than - willing to answer new and obscure questions about using Apache on NetWare.

+

The bug reporting page and dev-httpd mailing list are + not provided to answer questions about configuration or + running Apache. Before you submit a bug report or request, first + consult this document, the Frequently Asked + Questions page and the other relevant documentation topics. If + you still have a question or problem, post it to the + novell.devsup.webserver newsgroup, where many Apache users are + more than willing to answer new and obscure questions about using + Apache on NetWare.

Most of this document assumes that you are installing Apache from a binary distribution. If you want to compile Apache @@ -324,7 +327,7 @@

Apache is configured by reading configuration files usually stored in the conf directory. These are the same as files used to configure the Unix version, but there are a few different directives for - Apache on NetWare. See the Apache + Apache on NetWare. See the Apache module documentation for all the available directives.

The main differences in Apache for NetWare are:

diff --git a/docs/manual/programs/log_server_status.xml b/docs/manual/programs/log_server_status.xml index 034bf270928..39feb98a0c6 100644 --- a/docs/manual/programs/log_server_status.xml +++ b/docs/manual/programs/log_server_status.xml @@ -20,7 +20,7 @@ limitations under the License. --> - + Programs log_server_status - Log periodic status summaries diff --git a/docs/manual/programs/split-logfile.xml b/docs/manual/programs/split-logfile.xml index 6cb5b384637..63f8f8a43ed 100644 --- a/docs/manual/programs/split-logfile.xml +++ b/docs/manual/programs/split-logfile.xml @@ -20,7 +20,7 @@ limitations under the License. --> - + Programs split-logfile - Split up multi-vhost logfiles diff --git a/docs/manual/rewrite/advanced.xml b/docs/manual/rewrite/advanced.xml index 170959ed912..99c986a8582 100644 --- a/docs/manual/rewrite/advanced.xml +++ b/docs/manual/rewrite/advanced.xml @@ -20,7 +20,7 @@ limitations under the License. --> - + Rewrite Advanced Techniques with mod_rewrite diff --git a/docs/manual/sitemap.xml b/docs/manual/sitemap.xml index 256c2093b90..79f29810303 100644 --- a/docs/manual/sitemap.xml +++ b/docs/manual/sitemap.xml @@ -50,8 +50,8 @@ Documentation.

Server-Wide Configuration Log Files Mapping URLs to Filesystem Locations -Security Tips Dynamic Shared Object (DSO) support +HTTP Protocol Compliance Content Negotiation Custom error responses Setting which addresses and ports Apache uses @@ -62,7 +62,7 @@ Documentation.

Filters Shared Object Cache Support suEXEC Support -Performance Hints +Issues Regarding DNS and Apache Frequently Asked Questions @@ -75,7 +75,6 @@ Documentation.

VirtualHost Examples An In-Depth Discussion of Virtual Host Matching File descriptor limitations -Issues Regarding DNS and Apache @@ -83,12 +82,18 @@ Documentation.

Overview mod_rewrite reference documentation -Introduction -Flags -Technical details -Remapping URLs -Access control +Introduction to regular expressions and +mod_rewrite +Using mod_rewrite for redirection and +remapping of URLs +Using mod_rewrite to control access +Dynamic virtual hosts with mod_rewrite +Dynamic proxying with mod_rewrite +Using RewriteMap Advanced techniques +When NOT to use mod_rewrite +RewriteRule Flags +Technical details @@ -103,7 +108,8 @@ documentation Guides, Tutorials, and HowTos Overview -Authentication +Authentication and Authorization +Access Control Dynamic Content with CGI Introduction to Server Side Includes .htaccess files @@ -117,6 +123,7 @@ documentation Windows Compiling Apache for Microsoft Windows +Using Apache With RPM Based Systems Using Apache with Novell NetWare Running a High-Performance Web Server on HPUX @@ -131,12 +138,18 @@ Server on HPUX Manual Page: apxs Manual Page: configure Manual Page: dbmmanage +Manual Page: fcgistarter +Manual Page: firehose Manual Page: htcacheclean Manual Page: htdbm Manual Page: htdigest Manual Page: htpasswd +Manual Page: httxt2dbm Manual Page: logresolve +Manual Page: +log_server_status Manual Page: rotatelogs +Manual Page: split-logfile Manual Page: suexec Other Programs @@ -144,7 +157,11 @@ Server on HPUX Apache Miscellaneous Documentation Overview +Performance Notes - Apache Tuning +Performance Scaling +Security Tips Relevant Standards +Password Encryption Formats @@ -164,6 +181,8 @@ Server on HPUX Converting Modules from 1.3 to 2.x Request Processing in 2.x How Filters Work in 2.x +Guidelines for output filters in 2.x +Thread Safety Issues in 2.x