From: André Malo Date: Mon, 20 Jan 2014 08:16:27 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.5.0-alpha~4634 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d631f231b5ebba27ab6c4be56c329206731049ae;p=apache update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1559642 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/httpd.8 b/docs/man/httpd.8 index 5c529a6872..a78ccfdcea 100644 --- a/docs/man/httpd.8 +++ b/docs/man/httpd.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTTPD" 8 "2012-02-10" "Apache HTTP Server" "httpd" +.TH "HTTPD" 8 "2014-01-20" "Apache HTTP Server" "httpd" .SH NAME httpd \- Apache Hypertext Transfer Protocol Server @@ -92,7 +92,7 @@ Show the settings as parsed from the config file (currently only shows the virtu Skip document root check at startup/restart\&. .TP -t -Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&. +Run syntax tests for configuration files only\&. The program immediately exits after these syntax parsing tests with either a return code of 0 (Syntax OK) or return code not equal to 0 (Syntax Error)\&. If -D \fIDUMP\fR_\fIVHOSTS \fRis also set, details of the virtual host configuration will be printed\&. If -D \fIDUMP\fR_\fIMODULES \fR is set, all loaded modules will be printed\&. If -D \fIDUMP\fR_\fICERTS \fR is set and mod_ssl is used, configured SSL certificates will be printed\&. If -D \fIDUMP\fR_\fICA\fR_\fI_CERTS \fR is set and mod_ssl is used, configured SSL CA certificates and configured directories containing SSL CA certificates will be printed\&. .TP -v Print the version of httpd, and then exit\&. diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index d641ce8931..46362c74f9 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -162,6 +162,7 @@ cgimapextension mod/core.html#cgimapextension charsetdefault mod/mod_charset_lite.html#charsetdefault charsetoptions mod/mod_charset_lite.html#charsetoptions charsetsourceenc mod/mod_charset_lite.html#charsetsourceenc +checkbasenamematch mod/mod_speling.html#checkbasenamematch checkcaseonly mod/mod_speling.html#checkcaseonly checkspelling mod/mod_speling.html#checkspelling chrootdir mod/mod_unixd.html#chrootdir @@ -199,6 +200,7 @@ deflatememlevel mod/mod_deflate.html#deflatememlevel deflatewindowsize mod/mod_deflate.html#deflatewindowsize deny mod/mod_access_compat.html#deny directory mod/core.html#directory +directorycheckhandler mod/mod_dir.html#directorycheckhandler directoryindex mod/mod_dir.html#directoryindex directoryindexredirect mod/mod_dir.html#directoryindexredirect directorymatch mod/core.html#directorymatch @@ -552,6 +554,7 @@ sslocspoverrideresponder mod/mod_ssl.html#sslocspoverrideresponder sslocsprespondertimeout mod/mod_ssl.html#sslocsprespondertimeout sslocspresponsemaxage mod/mod_ssl.html#sslocspresponsemaxage sslocspresponsetimeskew mod/mod_ssl.html#sslocspresponsetimeskew +sslopensslconfcmd mod/mod_ssl.html#sslopensslconfcmd ssloptions mod/mod_ssl.html#ssloptions sslpassphrasedialog mod/mod_ssl.html#sslpassphrasedialog sslprotocol mod/mod_ssl.html#sslprotocol diff --git a/docs/manual/env.html.en b/docs/manual/env.html.en index 6a1c11767f..1326211228 100644 --- a/docs/manual/env.html.en +++ b/docs/manual/env.html.en @@ -141,6 +141,16 @@ late during request processing meaning that directives such as SetEnvIf and RewriteCond will not see the variables set with it. + +
  • When the server looks up a path via an internal + subrequest such as looking + for a DirectoryIndex + or generating a directory listing with mod_autoindex, + per-request environment variables are not inherited in the + subrequest. Additionally, + SetEnvIf directives + are not separately evaluated in the subrequest due to the API phases + mod_setenvif takes action in.
    • top
    @@ -148,7 +158,7 @@

    Using Environment Variables

    -
    Related ModulesRelated Directives
    +
    Related ModulesRelated Directives

    CGI Scripts

    @@ -482,9 +492,7 @@ SetEnvIf Referer "^http://www\.example\.com/" local_referal # Allow browsers that do not send Referer info SetEnvIf Referer "^$" local_referal <Directory /web/images> - Order Deny,Allow - Deny from all - Allow from env=local_referal + Require env local_referal </Directory> diff --git a/docs/manual/env.html.fr b/docs/manual/env.html.fr index 503d698363..a7035cf157 100644 --- a/docs/manual/env.html.fr +++ b/docs/manual/env.html.fr @@ -151,6 +151,15 @@ cours du traitement de la requête, ce qui signifie que des directives telles que SetEnvIf et RewriteCond ne verront pas les variables qu'elle aura définies. + +
  • Lorsque le serveur cherche un chemin via une sous-requête interne (par exemple la + recherche d'un DirectoryIndex), ou lorsqu'il génère un + listing du contenu d'un répertoire via le module + mod_autoindex, la sous-requête n'hérite pas des + variables d'environnement spécifiques à la requête. En outre, à cause + des phases de l'API auxquelles mod_setenvif prend + part, les directives SetEnvIf ne sont pas évaluées + séparément dans la sous-requête.
    • top
    @@ -158,7 +167,7 @@

    Utilisation des variables d'environnement

    -
    Modules ApparentésDirectives Apparentées
    +
    Modules ApparentésDirectives Apparentées

    Scripts CGI

    @@ -514,9 +523,7 @@ SetEnvIf Referer "^http://www\.example\.com/" local_referal # Autorise les navigateurs qui n'envoient aucune information de Referer SetEnvIf Referer "^$" local_referal <Directory /web/images> - Order Deny,Allow - Deny from all - Allow from env=local_referal + Require env local_referal </Directory> diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja index b47a605432..ead3237e33 100644 --- a/docs/manual/env.xml.ja +++ b/docs/manual/env.xml.ja @@ -1,7 +1,7 @@ - + + + + + - + + + + + + + + + + + + + + + + + + +