From d08bbb3b62b468a8081fce31d20a992461ffa194 Mon Sep 17 00:00:00 2001 From: Daniel Gruno Date: Fri, 27 Apr 2012 06:17:57 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1331236 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_buffer.html.en | 5 +- docs/manual/mod/mod_buffer.xml.fr | 2 +- docs/manual/mod/mod_buffer.xml.meta | 2 +- docs/manual/mod/mod_cache.html.en | 314 +++++++++++---------- docs/manual/mod/mod_cache.xml.fr | 2 +- docs/manual/mod/mod_cache.xml.ja | 2 +- docs/manual/mod/mod_cache.xml.ko | 2 +- docs/manual/mod/mod_cache.xml.meta | 2 +- docs/manual/mod/mod_cache_disk.html.en | 25 +- docs/manual/mod/mod_cache_disk.xml.fr | 2 +- docs/manual/mod/mod_cache_disk.xml.ja | 2 +- docs/manual/mod/mod_cache_disk.xml.ko | 2 +- docs/manual/mod/mod_cache_disk.xml.meta | 2 +- docs/manual/mod/mod_cern_meta.xml.ko | 2 +- docs/manual/mod/mod_cgi.xml.ja | 2 +- docs/manual/mod/mod_cgi.xml.ko | 2 +- docs/manual/mod/mod_cgid.xml.ja | 2 +- docs/manual/mod/mod_cgid.xml.ko | 2 +- docs/manual/mod/mod_charset_lite.xml.ko | 2 +- docs/manual/mod/mod_dav.xml.ja | 2 +- docs/manual/mod/mod_dav.xml.ko | 2 +- docs/manual/mod/mod_dav_fs.xml.ja | 2 +- docs/manual/mod/mod_dav_fs.xml.ko | 2 +- docs/manual/mod/mod_dav_lock.xml.ja | 2 +- docs/manual/mod/mod_deflate.html.en | 136 ++++----- docs/manual/mod/mod_deflate.xml.fr | 2 +- docs/manual/mod/mod_deflate.xml.ja | 2 +- docs/manual/mod/mod_deflate.xml.ko | 2 +- docs/manual/mod/mod_deflate.xml.meta | 2 +- docs/manual/mod/mod_dir.xml.ja | 2 +- docs/manual/mod/mod_dir.xml.ko | 2 +- docs/manual/mod/mod_dir.xml.tr | 2 +- docs/manual/mod/mod_dumpio.xml.ja | 2 +- docs/manual/mod/mod_echo.html.en | 3 + docs/manual/mod/mod_echo.xml.fr | 2 +- docs/manual/mod/mod_echo.xml.ja | 2 +- docs/manual/mod/mod_echo.xml.ko | 2 +- docs/manual/mod/mod_echo.xml.meta | 2 +- docs/manual/mod/mod_env.html.en | 9 + docs/manual/mod/mod_env.xml.fr | 2 +- docs/manual/mod/mod_env.xml.ja | 2 +- docs/manual/mod/mod_env.xml.ko | 2 +- docs/manual/mod/mod_env.xml.meta | 4 +- docs/manual/mod/mod_env.xml.tr | 2 +- docs/manual/mod/mod_example.xml.ko | 2 +- docs/manual/mod/mod_expires.html.en | 50 ++-- docs/manual/mod/mod_expires.xml.fr | 2 +- docs/manual/mod/mod_expires.xml.ja | 2 +- docs/manual/mod/mod_expires.xml.ko | 2 +- docs/manual/mod/mod_expires.xml.meta | 2 +- docs/manual/mod/mod_ext_filter.xml.ja | 2 +- docs/manual/mod/mod_ext_filter.xml.ko | 2 +- docs/manual/mod/mod_file_cache.xml.ko | 2 +- docs/manual/mod/mod_headers.html.en | 57 ++-- docs/manual/mod/mod_headers.xml.fr | 2 +- docs/manual/mod/mod_headers.xml.ja | 2 +- docs/manual/mod/mod_headers.xml.ko | 2 +- docs/manual/mod/mod_headers.xml.meta | 2 +- docs/manual/mod/mod_imagemap.xml.ko | 2 +- docs/manual/mod/mod_include.xml.ja | 2 +- docs/manual/mod/mod_info.html.en | 62 ++--- docs/manual/mod/mod_info.xml.fr | 2 +- docs/manual/mod/mod_info.xml.ja | 2 +- docs/manual/mod/mod_info.xml.ko | 2 +- docs/manual/mod/mod_info.xml.meta | 2 +- docs/manual/mod/mod_isapi.xml.ko | 2 +- docs/manual/mod/mod_ldap.html.en | 269 +++++++++--------- docs/manual/mod/mod_ldap.xml.fr | 2 +- docs/manual/mod/mod_ldap.xml.meta | 2 +- docs/manual/mod/mod_log_config.html.en | 48 ++-- docs/manual/mod/mod_log_config.xml.ja | 2 +- docs/manual/mod/mod_log_config.xml.ko | 2 +- docs/manual/mod/mod_log_config.xml.meta | 2 +- docs/manual/mod/mod_log_config.xml.tr | 2 +- docs/manual/mod/mod_lua.html.en | 39 ++- docs/manual/mod/mod_lua.xml.fr | 2 +- docs/manual/mod/mod_mime.xml.ja | 2 +- docs/manual/mod/mod_negotiation.html.en | 28 +- docs/manual/mod/mod_negotiation.xml.fr | 2 +- docs/manual/mod/mod_negotiation.xml.ja | 2 +- docs/manual/mod/mod_negotiation.xml.meta | 2 +- docs/manual/mod/mod_proxy.html.en | 319 ++++++++++++---------- docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/mod_proxy_ajp.xml.ja | 2 +- docs/manual/mod/mod_proxy_balancer.xml.ja | 2 +- docs/manual/mod/mod_remoteip.html.en | 48 +++- docs/manual/mod/mod_remoteip.xml.fr | 2 +- docs/manual/mod/mod_remoteip.xml.meta | 2 +- docs/manual/mod/mod_rewrite.html.en | 39 ++- docs/manual/mod/mod_rewrite.xml.fr | 2 +- docs/manual/mod/mod_rewrite.xml.meta | 2 +- docs/manual/mod/mod_sed.html.en | 46 ++-- docs/manual/mod/mod_sed.xml.fr | 2 +- docs/manual/mod/mod_sed.xml.meta | 2 +- docs/manual/mod/mod_setenvif.html.en | 84 +++--- docs/manual/mod/mod_setenvif.xml.fr | 2 +- docs/manual/mod/mod_setenvif.xml.ja | 2 +- docs/manual/mod/mod_setenvif.xml.ko | 2 +- docs/manual/mod/mod_setenvif.xml.meta | 4 +- docs/manual/mod/mod_setenvif.xml.tr | 2 +- docs/manual/mod/mod_so.html.en | 8 +- docs/manual/mod/mod_so.xml.fr | 2 +- docs/manual/mod/mod_so.xml.ja | 2 +- docs/manual/mod/mod_so.xml.ko | 2 +- docs/manual/mod/mod_so.xml.meta | 4 +- docs/manual/mod/mod_so.xml.tr | 2 +- docs/manual/mod/mod_status.html.en | 16 +- docs/manual/mod/mod_status.xml.fr | 2 +- docs/manual/mod/mod_status.xml.ja | 2 +- docs/manual/mod/mod_status.xml.ko | 2 +- docs/manual/mod/mod_status.xml.meta | 4 +- docs/manual/mod/mod_status.xml.tr | 2 +- docs/manual/mod/mod_suexec.html.en | 3 + docs/manual/mod/mod_suexec.xml.ja | 2 +- docs/manual/mod/mod_suexec.xml.ko | 2 +- docs/manual/mod/mod_suexec.xml.meta | 2 +- docs/manual/mod/mod_suexec.xml.tr | 2 +- docs/manual/mod/mod_unixd.html.en | 3 + docs/manual/mod/mod_unixd.xml.meta | 2 +- docs/manual/mod/mod_unixd.xml.tr | 2 +- docs/manual/mod/mod_userdir.html.en | 21 +- docs/manual/mod/mod_userdir.xml.ja | 2 +- docs/manual/mod/mod_userdir.xml.ko | 2 +- docs/manual/mod/mod_userdir.xml.meta | 2 +- docs/manual/mod/mod_userdir.xml.tr | 2 +- docs/manual/mod/mod_version.html.en | 58 ++-- docs/manual/mod/mod_version.xml.ja | 2 +- docs/manual/mod/mod_version.xml.ko | 2 +- docs/manual/mod/mod_version.xml.meta | 2 +- docs/manual/mod/mod_vhost_alias.xml.tr | 2 +- docs/manual/mod/mpm_common.xml.de | 2 +- docs/manual/mod/mpm_common.xml.ja | 2 +- docs/manual/mod/mpm_common.xml.tr | 2 +- 135 files changed, 1043 insertions(+), 877 deletions(-) diff --git a/docs/manual/mod/mod_buffer.html.en b/docs/manual/mod/mod_buffer.html.en index 1ea6677117..9e3636b2b7 100644 --- a/docs/manual/mod/mod_buffer.html.en +++ b/docs/manual/mod/mod_buffer.html.en @@ -59,7 +59,10 @@ AddOutputFilterByType directives.

Using buffer with mod_include

- AddOutputFilterByType INCLUDES;BUFFER text/html
+ 

+        AddOutputFilterByType INCLUDES;BUFFER text/html
+
+

The buffer filters read the request/response into diff --git a/docs/manual/mod/mod_buffer.xml.fr b/docs/manual/mod/mod_buffer.xml.fr index 7a42c68f5d..a690708e33 100644 --- a/docs/manual/mod/mod_buffer.xml.fr +++ b/docs/manual/mod/mod_buffer.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_buffer.xml.meta b/docs/manual/mod/mod_buffer.xml.meta index 8451d7a1eb..27ce06f821 100644 --- a/docs/manual/mod/mod_buffer.xml.meta +++ b/docs/manual/mod/mod_buffer.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index f2f5df3faa..39f8007008 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -170,27 +170,25 @@

Sample Configuration

Sample httpd.conf

- #
- # Sample Cache Configuration
- #
- LoadModule cache_module modules/mod_cache.so
-
- <IfModule mod_cache.c>
- - LoadModule cache_disk_module modules/mod_cache_disk.so
- <IfModule mod_cache_disk.c>
- - CacheRoot c:/cacheroot
- CacheEnable disk /
- CacheDirLevels 5
- CacheDirLength 3
- - </IfModule>
-
- # When acting as a proxy, don't cache the list of security updates
- CacheDisable http://security.update.server/update-list/
- - </IfModule> + 

+#
+# Sample Cache Configuration
+#
+LoadModule cache_module modules/mod_cache.so
+<IfModule mod_cache.c>
+    LoadModule cache_disk_module modules/mod_cache_disk.so
+    <IfModule mod_cache_disk.c>
+        CacheRoot c:/cacheroot
+        CacheEnable disk  /
+        CacheDirLevels 5
+        CacheDirLength 3
+    </IfModule>
+    
+    # When acting as a proxy, don't cache the list of security updates
+    CacheDisable http://security.update.server/update-list/
+</IfModule>
+
+

top
@@ -244,16 +242,17 @@

Example configuration

Enabling the cache lock

- #
- # Enable the cache lock
- #
- <IfModule mod_cache.c>
- - CacheLock on
- CacheLockPath /tmp/mod_cache-lock
- CacheLockMaxAge 5
- - </IfModule> + 

+#
+# Enable the cache lock
+#
+<IfModule mod_cache.c>
+    CacheLock on
+    CacheLockPath /tmp/mod_cache-lock
+    CacheLockMaxAge 5
+</IfModule>
+
+

top
@@ -287,33 +286,36 @@ place the CACHE filter before the DEFLATE filter as in the example below:

-

- # Cache content before optional compression
- CacheQuickHandler off
- AddOutputFilterByType CACHE;DEFLATE text/plain

-

+ 
+# Cache content before optional compression
+CacheQuickHandler off
+AddOutputFilterByType CACHE;DEFLATE text/plain
+
+

Another option is to have content cached before personalisation is applied by mod_include (or another content processing filter). In this example templates containing tags understood by mod_include are cached before being parsed:

-

- # Cache content before mod_include and mod_deflate
- CacheQuickHandler off
- AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html

-

+ 
+# Cache content before mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html
+
+

You may place the CACHE filter anywhere you wish within the filter chain. In this example, content is cached after being parsed by mod_include, but before being processed by mod_deflate:

-

- # Cache content between mod_include and mod_deflate
- CacheQuickHandler off
- AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html

-

+ 
+# Cache content between mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType INCLUDES;CACHE;DEFLATE text/html
+
+

Warning:

If the location of the CACHE filter in the filter chain is changed for any reason, @@ -331,9 +333,10 @@ LogFormat directive as follows:

-

+ 

     LogFormat "%{cache-status}e ..."
-
+ +

Based on the caching decision made, the reason is also written to the subprocess environment under one the following four keys, as appropriate:

@@ -350,12 +353,13 @@

This makes it possible to support conditional logging of cached requests as per the following example:

-

- CustomLog cached-requests.log common env=cache-hit
- CustomLog uncached-requests.log common env=cache-miss
- CustomLog revalidated-requests.log common env=cache-revalidate
- CustomLog invalidated-requests.log common env=cache-invalidate
-

+ 
+CustomLog cached-requests.log common env=cache-hit
+CustomLog uncached-requests.log common env=cache-miss
+CustomLog revalidated-requests.log common env=cache-revalidate
+CustomLog invalidated-requests.log common env=cache-invalidate
+
+

For module authors, a hook called cache_status is available, allowing modules to respond to the caching outcomes above in customised @@ -376,9 +380,10 @@ with the document. The value specified with the CacheMaxExpire directive does not override this setting.

-

+ 

       CacheDefaultExpire 86400
-
+ +
top
@@ -407,10 +412,11 @@ is used, this directive must appear within a server or virtual host context, otherwise the setting will be ignored.

-

- # Enable the X-Cache-Detail header
- CacheDetailHeader on
-

+ 
+# Enable the X-Cache-Detail header
+CacheDetailHeader on
+
+

X-Cache-Detail: "conditional cache hit: entity refreshed" from localhost
@@ -432,7 +438,10 @@ url-string.

Example

+ 

       CacheDisable /local_files
+
+

If used in a <Location> directive, @@ -440,11 +449,12 @@ is used, caching for the whole location will be disabled.

Example

- <Location /foo>
- - CacheDisable on
- - </Location>
+ 

+<Location /foo>
+    CacheDisable on
+</Location>
+
+

The no-cache environment variable can be set to @@ -495,37 +505,39 @@ manager also be used to specify remote sites and proxy protocols which caching should be enabled for.

-

- # Cache content
- <Location /foo>
- - CacheEnable disk
- - </Location>

- # Cache regex
- <LocationMatch foo$>
- - CacheEnable disk
- - </LocationMatch>

- # Cache proxied url's
- CacheEnable disk /

- # Cache FTP-proxied url's
- CacheEnable disk ftp://

- # Cache content from www.example.org
- CacheEnable disk http://www.example.org/
-

+ 
+# Cache content
+<Location /foo>
+    CacheEnable disk
+</Location>
+
+# Cache regex
+<LocationMatch foo$>
+    CacheEnable disk
+</LocationMatch>
+
+# Cache proxied url's
+CacheEnable  disk  /
+
+# Cache FTP-proxied url's
+CacheEnable  disk  ftp://
+
+# Cache content from www.example.org
+CacheEnable  disk  http://www.example.org/
+
+

A hostname starting with a "*" matches all hostnames with that suffix. A hostname starting with "." matches all hostnames containing the domain components that follow.

-

- # Match www.example.org, and fooexample.org
- CacheEnable disk http://*example.org/
- # Match www.example.org, but not fooexample.org
- CacheEnable disk http://.example.org/
-

+ 
+# Match www.example.org, and fooexample.org
+CacheEnable  disk  http://*example.org/
+# Match www.example.org, but not fooexample.org
+CacheEnable  disk  http://.example.org/
+
+

The no-cache environment variable can be set to disable caching on a finer grained set of resources in versions @@ -565,14 +577,16 @@ manager server and was not served from cache. -

- # Enable the X-Cache header
- CacheHeader on
-

+ 
+# Enable the X-Cache header
+CacheHeader on
+
+ + + 
+    X-Cache: HIT from localhost
+
-

- X-Cache: HIT from localhost
-

@@ -594,9 +608,10 @@ manager if the request contains no-cache header values. Resources requiring authorization will never be cached.

-

+ 

       CacheIgnoreCacheControl On
-
+ +

Warning:

This directive will allow serving from the cache even if the client has @@ -648,11 +663,17 @@ manager None.

Example 1

+ 

       CacheIgnoreHeaders Set-Cookie
+
+

Example 2

+ 

       CacheIgnoreHeaders None
+
+

Warning:

@@ -685,9 +706,10 @@ header. CacheDefaultExpire directive will be used to generate an expiration date.

-

+ 

       CacheIgnoreNoLastMod On
-
+ +
top
@@ -709,9 +731,10 @@ header. view the request is treated as if having no query string when this directive is enabled.

-

+ 

       CacheIgnoreQueryString On
-
+ +
@@ -743,11 +766,17 @@ header. identifiers. Otherwise, each identifier is added to the list.

Example 1

+ 

       CacheIgnoreURLSessionIdentifiers jsessionid
+
+

Example 2

+ 

       CacheIgnoreURLSessionIdentifiers None
+
+

@@ -771,10 +800,11 @@ header. should be cached beneath the same cache key, a new base URL can be specified with this directive.

-

- # Override the base URL of the cache key.
- CacheKeyBaseURL http://www.example.com/
-

+ 
+# Override the base URL of the cache key.
+CacheKeyBaseURL http://www.example.com/
+
+
Take care when setting this directive. If two separate virtual hosts are accidentally given the same base URL, entries from one virtual host @@ -812,9 +842,10 @@ LastModified date. CacheMaxExpire, then the latter takes precedence.

-

+ 

       CacheLastModifiedFactor 0.5
-
+ +
top
@@ -834,10 +865,11 @@ LastModified date.

In a minimal configuration the following directive is all that is needed to enable the thundering herd lock in the default system temp directory.

-

- # Enable cache lock
- CacheLock on

-

+ 
+# Enable cache lock
+CacheLock on
+
+
@@ -894,9 +926,10 @@ LastModified date. server. Thus, documents will be out of date at most this number of seconds. This maximum value is enforced even if an expiry date was supplied with the document.

-

+ 

       CacheMaxExpire 604800
-
+ +
top
@@ -914,9 +947,10 @@ LastModified date. server. This is only used if no valid expire time was supplied with the document.

-

+ 

       CacheMinExpire 3600
-
+ +
top
@@ -944,21 +978,23 @@ LastModified date. slower than the default, it allows the cache to be used in cases where full processing is required, such as when content is subject to authorisation.

-

- # Run cache as a normal handler
- CacheQuickHandler off

-

+ 
+# Run cache as a normal handler
+CacheQuickHandler off
+
+

It is also possible, when the quick handler is disabled, for the administrator to choose the precise location within the filter chain where caching is to be performed, by adding the CACHE filter to the chain.

-

- # Cache content before mod_include and mod_deflate
- CacheQuickHandler off
- AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html

-

+ 
+# Cache content before mod_include and mod_deflate
+CacheQuickHandler off
+AddOutputFilterByType CACHE;INCLUDES;DEFLATE text/html
+
+

If the CACHE filter is specified more than once, the last instance will apply.

@@ -983,10 +1019,11 @@ LastModified date. and the raw 5xx responses returned to the client on request, the 5xx response so returned to the client will not invalidate the content in the cache.

-

- # Serve stale data on error.
- CacheStaleOnError on
-

+ 
+# Serve stale data on error.
+CacheStaleOnError on
+
+ @@ -1009,9 +1046,10 @@ LastModified date. the origin server, and the response may be fulfilled from cache if the backend resource has not changed.

-

+ 

       CacheStoreExpired On
-
+ +
top
@@ -1032,9 +1070,10 @@ LastModified date. no-store header values. Resources requiring authorization will never be cached.

-

+ 

       CacheStoreNoStore On
-
+ +

Warning:

As described in RFC 2616, the no-store directive is intended to @@ -1067,9 +1106,10 @@ LastModified date. private header values. Resources requiring authorization will never be cached.

-

+ 

       CacheStorePrivate On
-
+ +

Warning:

This directive will allow caching even if the upstream server has diff --git a/docs/manual/mod/mod_cache.xml.fr b/docs/manual/mod/mod_cache.xml.fr index ae9b342720..b85ef58b3c 100644 --- a/docs/manual/mod/mod_cache.xml.fr +++ b/docs/manual/mod/mod_cache.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_cache.xml.ja b/docs/manual/mod/mod_cache.xml.ja index 3dea12f921..5dfdda9f81 100644 --- a/docs/manual/mod/mod_cache.xml.ja +++ b/docs/manual/mod/mod_cache.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_cache_disk.xml.ja b/docs/manual/mod/mod_cache_disk.xml.ja index 03bafccce6..be5b0820f6 100644 --- a/docs/manual/mod/mod_cache_disk.xml.ja +++ b/docs/manual/mod/mod_cache_disk.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + + + + + + + + diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja index 3021c984c6..b546b68d73 100644 --- a/docs/manual/mod/mod_deflate.xml.ja +++ b/docs/manual/mod/mod_deflate.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/mod/mod_echo.xml.ja b/docs/manual/mod/mod_echo.xml.ja index 387fd11c6c..c22939e0f8 100644 --- a/docs/manual/mod/mod_echo.xml.ja +++ b/docs/manual/mod/mod_echo.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_env.xml.ja b/docs/manual/mod/mod_env.xml.ja index b90d09e129..9279586bde 100644 --- a/docs/manual/mod/mod_env.xml.ja +++ b/docs/manual/mod/mod_env.xml.ja @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/mod/mod_expires.xml.ja b/docs/manual/mod/mod_expires.xml.ja index 5ebb44836b..296777a6a5 100644 --- a/docs/manual/mod/mod_expires.xml.ja +++ b/docs/manual/mod/mod_expires.xml.ja @@ -1,7 +1,7 @@ - + + + + + + diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja index 8091594eb6..ff390d4cef 100644 --- a/docs/manual/mod/mod_headers.xml.ja +++ b/docs/manual/mod/mod_headers.xml.ja @@ -1,7 +1,7 @@ - + + + + + diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja index cdf24ce95c..acde858bad 100644 --- a/docs/manual/mod/mod_info.xml.ja +++ b/docs/manual/mod/mod_info.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/mod/mod_ldap.xml.meta b/docs/manual/mod/mod_ldap.xml.meta index 92fe318361..c8ca841281 100644 --- a/docs/manual/mod/mod_ldap.xml.meta +++ b/docs/manual/mod/mod_ldap.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index db2de36b2d..ba1fcb5fb7 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -412,14 +412,15 @@ expr=expression]

For example, the following two sets of directives have exactly the same effect:

-

- # CustomLog with format nickname
- LogFormat "%h %l %u %t \"%r\" %>s %b" common
- CustomLog logs/access_log common
-
- # CustomLog with explicit format string
- CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b" -

+ 
+# CustomLog with format nickname
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+CustomLog logs/access_log common
+
+# CustomLog with explicit format string
+CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b"
+
+

The third argument is optional and controls whether or not to log a particular request. The condition can be the @@ -436,19 +437,21 @@ expr=expression] images on your server in a separate logfile but not in your main log, you can use:

-

- SetEnvIf Request_URI \.gif$ gif-image
- CustomLog gif-requests.log common env=gif-image
- CustomLog nongif-requests.log common env=!gif-image -

+ 
+SetEnvIf Request_URI \.gif$ gif-image
+CustomLog gif-requests.log common env=gif-image
+CustomLog nongif-requests.log common env=!gif-image
+
+

Or, to reproduce the behavior of the old RefererIgnore directive, you might use the following:

-

- SetEnvIf Referer example\.com localreferer
- CustomLog referer.log referer env=!localreferer -

+ 
+SetEnvIf Referer example\.com localreferer
+CustomLog referer.log referer env=!localreferer
+
+
top
@@ -492,8 +495,12 @@ expr=expression] percent signs (%).

Example

+ 

       LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common
+
+

+
top
@@ -515,8 +522,11 @@ expr=expression] other format has been specified.

Example

- LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
- TransferLog logs/access_log + 

+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\""
+TransferLog logs/access_log
+
+

diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 90b43b6958..b059a4b800 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja index 89ebedc0e1..a45ad948d4 100644 --- a/docs/manual/mod/mod_mime.xml.ja +++ b/docs/manual/mod/mod_mime.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_negotiation.xml.ja b/docs/manual/mod/mod_negotiation.xml.ja index a776506e86..22558d0a14 100644 --- a/docs/manual/mod/mod_negotiation.xml.ja +++ b/docs/manual/mod/mod_negotiation.xml.ja @@ -1,7 +1,7 @@ - + + diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 033568170f..304335449b 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/mod/mod_remoteip.xml.meta b/docs/manual/mod/mod_remoteip.xml.meta index 1a7c78a9f1..771852e80c 100644 --- a/docs/manual/mod/mod_remoteip.xml.meta +++ b/docs/manual/mod/mod_remoteip.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 66a39b992c..55b2c203d4 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -85,7 +85,10 @@ URLs on the fly

Example

+ 

       LogLevel alert rewrite:trace3
+
+

RewriteLog

@@ -138,15 +141,16 @@ URLs on the fly since the resource was not relative to the document root. This misconfiguration would normally cause the server to look for an "opt" directory under the document root.

-
+
 DocumentRoot /var/www/example.com
 Alias /myapp /opt/myapp-1.2.3
 <Directory /opt/myapp-1.2.3>
-RewriteEngine On
-RewriteBase /myapp/
-RewriteRule ^index\.html$  welcome.html 
+    RewriteEngine On
+    RewriteBase /myapp/
+    RewriteRule ^index\.html$  welcome.html 
 </Directory>
-
+ +
top
@@ -619,10 +623,11 @@ RewriteRule ^index\.html$ welcome.html to block unwanted hotlinking.

-

+ 

            RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"

            RewriteRule ^/images - [F]
-
+ +
  • You can also set special flags for @@ -648,12 +653,13 @@ RewriteRule ^index\.html$ welcome.html Use this to combine rule conditions with a local OR instead of the implicit AND. Typical example: -
    +
     RewriteCond %{REMOTE_HOST}  ^host1  [OR]
 RewriteCond %{REMOTE_HOST}  ^host2  [OR]
 RewriteCond %{REMOTE_HOST}  ^host3
 RewriteRule ...some special stuff for any of these hosts...
-
    + + Without this flag you would have to write the condition/rule pair three times. @@ -678,7 +684,7 @@ RewriteRule ...some special stuff for any of these hosts... ``User-Agent:'' header of the request, you can use the following:

    -
    +
     RewriteCond  %{HTTP_USER_AGENT}  ^Mozilla
 RewriteRule  ^/$                 /homepage.max.html  [L]
 
@@ -686,7 +692,8 @@ RewriteCond  %{HTTP_USER_AGENT}  ^Lynx
 RewriteRule  ^/$                 /homepage.min.html  [L]
 
 RewriteRule  ^/$                 /homepage.std.html  [L]
-
    + +

    Explanation: If you use a browser which identifies itself as 'Mozilla' (including Netscape Navigator, Mozilla etc), then you @@ -776,16 +783,18 @@ Apache HTTP Server 2.0.41 and later

    For example, you might define a RewriteMap as:

    -

    + 

           RewriteMap examplemap txt:/path/to/file/map.txt
-
    + +

    You would then be able to use this map in a RewriteRule as follows:

    -

    + 

           RewriteRule ^/ex/(.*) ${examplemap:$1}
-
    + +

    The following combinations for MapType and MapSource can be used:

    diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index e99c773f19..47a943cbc0 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_sed.html.en b/docs/manual/mod/mod_sed.html.en index 1ce3de65f9..97a0b2f5f5 100644 --- a/docs/manual/mod/mod_sed.html.en +++ b/docs/manual/mod/mod_sed.html.en @@ -76,33 +76,31 @@ the author's blog.

    Sample Configuration

    Adding an output filter

    - # In the following example, the sed filter will change the string
    - # "monday" to "MON" and the string "sunday" to SUN in html documents
    - # before sending to the client.
    - - <Directory "/var/www/docs/sed">
    - - AddOutputFilter Sed html
    - OutputSed "s/monday/MON/g"
    - OutputSed "s/sunday/SUN/g"
    -     - </Directory>
    -     + 

    +# In the following example, the sed filter will change the string
+# "monday" to "MON" and the string "sunday" to SUN in html documents
+# before sending to the client.
+<Directory "/var/www/docs/sed"> 
+    AddOutputFilter Sed html 
+    OutputSed "s/monday/MON/g" 
+    OutputSed "s/sunday/SUN/g" 
+</Directory> 
+
    +

    Adding an input filter

    - # In the following example, the sed filter will change the string
    - # "monday" to "MON" and the string "sunday" to SUN in the POST data
    - # sent to PHP.
    - - <Directory "/var/www/docs/sed">
    - - AddInputFilter Sed php
    - InputSed "s/monday/MON/g"
    - InputSed "s/sunday/SUN/g"
    -     - </Directory>
    -     + 

    +# In the following example, the sed filter will change the string
+# "monday" to "MON" and the string "sunday" to SUN in the POST data
+# sent to PHP.
+<Directory "/var/www/docs/sed"> 
+    AddInputFilter Sed php 
+    InputSed "s/monday/MON/g" 
+    InputSed "s/sunday/SUN/g" 
+</Directory> 
+
    +

    top
    diff --git a/docs/manual/mod/mod_sed.xml.fr b/docs/manual/mod/mod_sed.xml.fr index 026fffd358..6b7ab335eb 100644 --- a/docs/manual/mod/mod_sed.xml.fr +++ b/docs/manual/mod/mod_sed.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_sed.xml.meta b/docs/manual/mod/mod_sed.xml.meta index be8c22239c..41bf4ca899 100644 --- a/docs/manual/mod/mod_sed.xml.meta +++ b/docs/manual/mod/mod_sed.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en index 44cfb66e7e..4b664b13c2 100644 --- a/docs/manual/mod/mod_setenvif.html.en +++ b/docs/manual/mod/mod_setenvif.html.en @@ -50,10 +50,11 @@ on characteristics of the request such as this example, which sets netscape if the browser is mozilla but not MSIE.

    -

    - BrowserMatch ^Mozilla netscape
    - BrowserMatch MSIE !netscape
    -

    +
    +BrowserMatch ^Mozilla netscape
+BrowserMatch MSIE !netscape
+
    +

    Directives

      @@ -85,17 +86,19 @@ on characteristics of the request sets environment variables conditional on the User-Agent HTTP request header. The following two lines have the same effect:

      -

      - BrowserMatchNoCase Robot is_a_robot
      - SetEnvIfNoCase User-Agent Robot is_a_robot
      -

      +
      +BrowserMatchNoCase Robot is_a_robot
+SetEnvIfNoCase User-Agent Robot is_a_robot
+
      +

      Some additional examples:

      -

      - BrowserMatch ^Mozilla forms jpeg=yes browser=netscape
      - BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript
      - BrowserMatch MSIE !javascript
      -

      +
      +BrowserMatch ^Mozilla forms jpeg=yes browser=netscape
+BrowserMatch "^Mozilla/[2-3]" tables agif frames javascript
+BrowserMatch MSIE !javascript
+
      +
    top
    @@ -115,19 +118,21 @@ respect to case semantically identical to the BrowserMatch directive. However, it provides for case-insensitive matching. For example:

    -

    - BrowserMatchNoCase mac platform=macintosh
    - BrowserMatchNoCase win platform=windows
    -

    +
    +BrowserMatchNoCase mac platform=macintosh
+BrowserMatchNoCase win platform=windows
+
    +

    The BrowserMatch and BrowserMatchNoCase directives are special cases of the SetEnvIf and SetEnvIfNoCase directives. The following two lines have the same effect:

    -

    - BrowserMatchNoCase Robot is_a_robot
    - SetEnvIfNoCase User-Agent Robot is_a_robot
    -

    +
    +BrowserMatchNoCase Robot is_a_robot
+SetEnvIfNoCase User-Agent Robot is_a_robot
+
    +
    top
    @@ -221,18 +226,18 @@ of

    value and replace them by parenthesized subexpressions of regex.

    -

    Example:

    +

    +SetEnvIf Request_URI "\.gif$" object_is_image=gif
+SetEnvIf Request_URI "\.jpg$" object_is_image=jpg
+SetEnvIf Request_URI "\.xbm$" object_is_image=xbm
+    
+SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral
+    
+SetEnvIf object_is_image xbm XBIT_PROCESSING=1
+    
+SetEnvIf ^TS  ^[a-z]  HAVE_TS
+
    - SetEnvIf Request_URI "\.gif$" object_is_image=gif
    - SetEnvIf Request_URI "\.jpg$" object_is_image=jpg
    - SetEnvIf Request_URI "\.xbm$" object_is_image=xbm
    - :
    - SetEnvIf Referer www\.mydomain\.example\.com intra_site_referral
    - :
    - SetEnvIf object_is_image xbm XBIT_PROCESSING=1
    - :
    - SetEnvIf ^TS ^[a-z] HAVE_TS
    -

    The first three will set the environment variable object_is_image if the request was for an image @@ -269,9 +274,10 @@ for additional examples. ap_expr. These expressions will be evaluated at runtime, and applied env-variable in the same fashion as SetEnvIf.

    -

    +

         SetEnvIfExpr "tolower(req('X-Sendfile')) == 'd:\images\very_big.iso')" iso_delivered
-
    + +

    This would set the environment variable iso_delivered every time our application attempts to send it via X-Sendfile

    @@ -279,9 +285,10 @@ for additional examples.

    A more useful example would be to set the variable rfc1918 if the remote IP address is a private address according to RFC 1918:

    -

    +

         SetEnvIfExpr "-R '10.0.0.0/8' || -R '172.16.0.0/12' || -R '192.168.0.0/16'" rfc1918
-
    + +

    See also