From c82bf6aa38e2b2140cc61dc71c0e472c6ed2570b Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Tue, 28 Jun 2016 04:48:28 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750446 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.en | 43 ++++++++++++++++++----------------- docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 2 +- docs/manual/mod/core.xml.tr | 2 +- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index b0f3eb1dad..c579210848 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -423,7 +423,7 @@ NoDecode option available in 2.3.12 and later.

When this directive is set to None and AllowOverrideList is set to - None .htaccess, files are + None, .htaccess files are completely ignored. In this case, the server will not even attempt to read .htaccess files in the filesystem.

@@ -508,8 +508,8 @@ NoDecode option available in 2.3.12 and later. Allow use of the directives controlling specific directory features (Options and XBitHack). - An equal sign may be given followed by a comma-separated list, without spaces, - of options that may be set using the Options command. + An equal sign may be given followed by a comma-separated list, without + spaces, of options that may be set using the Options command.

Implicit disabling of Options

Even though the list of options that may be used in .htaccess files @@ -843,7 +843,7 @@ DocumentRoot "/var/www/${servername}/htdocs" - @@ -1015,7 +1015,7 @@ the contents of file-system directories matching a regular expression.mod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-
<DirectoryMatch "^/var/www/combined/(?<sitename>[^/]+)">
+    
<DirectoryMatch "^/var/www/combined/(?<sitename>[^/]+)">
     Require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </DirectoryMatch>

 
@@ -1616,7 +1616,7 @@ ErrorLogFormat "[%{u}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M%
 
     
This would result in error messages such as:

 
-	

+    

     [Thu May 12 08:28:57.652118 2011] [core:error] [pid 8777:tid 4326490112] [client ::1:58619] File does not exist: /usr/local/apache2/htdocs/favicon.ico
     

 
@@ -1750,7 +1750,7 @@ earlier.
Description:Enclose a group of directives that apply only to the named file-system directory, sub-directories, and their contents.
Syntax:<Directory "directory-path"> +
Syntax:<Directory directory-path> ... </Directory>
Context:server config, virtual host
Status:Core
- + @@ -1823,7 +1823,7 @@ filenames does. However, it accepts a regular expression. For example:

-
<FilesMatch ".+\.(gif|jpe?g|png)$">
+    
<FilesMatch ".+\.(gif|jpe?g|png)$">
     # ...
 </FilesMatch>

 
@@ -1841,7 +1841,7 @@ filenames
     mod_rewrite. In order to prevent confusion, numbered
     (unnamed) backreferences are ignored. Use named groups instead.

 
-
<FilesMatch "^(?<sitename>[^/]+)">
+    
<FilesMatch "^(?<sitename>[^/]+)">
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </FilesMatch>

 
@@ -2651,7 +2651,7 @@ from the client
+ URL-path|URL> ... </Location> @@ -2818,7 +2818,7 @@ matching URLsmod_rewrite. In order to prevent confusion, numbered (unnamed) backreferences are ignored. Use named groups instead.

-
<LocationMatch "^/combined/(?<sitename>[^/]+)">
+    
<LocationMatch "^/combined/(?<sitename>[^/]+)">
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 </LocationMatch>

 
@@ -3027,9 +3027,9 @@ LogLevel info ssl_module:warn
Per directory loglevel configuration only affects messages that are - logged after the request has been parsed and that are associated with - the request. Log messages which are associated with the connection or - the server are not affected. + logged after the request has been parsed and that are associated with + the request. Log messages which are associated with the connection or + the server are not affected.

See also

@@ -3177,8 +3177,8 @@ resource
Description:Contains directives that apply to matched filenames
Syntax:<Files "filename"> ... </Files>
Syntax:<Files filename> ... </Files>
Context:server config, virtual host, directory, .htaccess
Override:All
Status:Core
Description:Applies the enclosed directives only to matching URLs
Syntax:<Location - "URL-path|URL"> ... </Location>
Context:server config, virtual host
Status:Core
Module:core
Compatibility:2.4.11 and later

This directive controls whether HTTP trailers are copied into the - internal representation of HTTP headers. This merging occurs when the - request body has been completely consumed, long after most header + internal representation of HTTP headers. This merging occurs when the + request body has been completely consumed, long after most header processing would have a chance to examine or modify request headers.

This option is provided for compatibility with releases prior to 2.4.11, where trailers were always merged.

@@ -3534,7 +3534,7 @@ directory

Normally, if multiple Options could apply to a directory, then the most specific one is used and - others are ignored; the options are not merged. (See how sections are merged.) + others are ignored; the options are not merged. (See how sections are merged.) However if all the options on the Options directive are preceded by a + or - symbol, the options are @@ -3608,7 +3608,8 @@ On Windows, from Apache 2.3.3 and later. otherwise, http is assumed for port 80 and https for port 443.

-

For example, if you are running https on a non-standard port, specify the protocol explicitly:

+

For example, if you are running https on a non-standard port, + specify the protocol explicitly:

Protocol https
@@ -3698,7 +3699,7 @@ On Windows, from Apache 2.3.3 and later.

QualifyRedirectURL Directive

+ fully qualified @@ -3987,7 +3988,7 @@ to name-virtual hosts (nor for ServerName vs. ServerAlias).

The complete list of names in the <VirtualHost> - directive are treated just like a (non wildcard) + directive are treated just like a (non wildcard) ServerAlias.

@@ -4038,7 +4039,7 @@ itself server attempts to deduce the client visible hostname by first asking the operating system for the system hostname, and if that fails, performing a reverse lookup on an IP address present on the system.

- +

If no port is specified in the ServerName, then the server will use the port from the incoming request. For optimal reliability and diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 26474435a2..d81d57ddc0 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 71d020c1fe..b2a33001b5 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + +

Description:Controls whether the REDIRECT_URL environment variable is -fully qualified
Syntax:QualifyRedirectURL ON|OFF
Default:QualifyRedirectURL OFF
Context:server config, virtual host, directory