You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2013/07/06 23:48:19 UTC
svn commit: r1500326 - in /httpd/httpd/trunk/docs: man/ manual/ manual/mod/
manual/programs/ manual/vhosts/
Author: sf
Date: Sat Jul 6 21:48:19 2013
New Revision: 1500326
URL: http://svn.apache.org/r1500326
Log:
xforms
Modified:
httpd/httpd/trunk/docs/man/htpasswd.1
httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr
httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta
httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en
httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.ko
httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.tr
httpd/httpd/trunk/docs/manual/upgrading.html.fr
httpd/httpd/trunk/docs/manual/upgrading.xml.meta
httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta
httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr
Modified: httpd/httpd/trunk/docs/man/htpasswd.1
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/htpasswd.1?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/htpasswd.1 (original)
+++ httpd/httpd/trunk/docs/man/htpasswd.1 Sat Jul 6 21:48:19 2013
@@ -19,7 +19,7 @@
.el .ne 3
.IP "\\$1" \\$2
..
-.TH "HTPASSWD" 1 "2013-04-05" "Apache HTTP Server" "htpasswd"
+.TH "HTPASSWD" 1 "2013-07-06" "Apache HTTP Server" "htpasswd"
.SH NAME
htpasswd \- Manage user files for basic authentication
@@ -71,7 +71,7 @@ Create the \fIpasswdfile\fR\&. If \fIpas
Display the results on standard output rather than updating a file\&. This is useful for generating password records acceptable to Apache for inclusion in non-text data stores\&. This option changes the syntax of the command line, since the \fIpasswdfile\fR argument (usually the first one) is omitted\&. It cannot be combined with the -c option\&.
.TP
-m
-Use MD5 encryption for passwords\&. This is the default\&.
+Use MD5 encryption for passwords\&. This is the default (since version 2\&.2\&.18)\&.
.TP
-B
Use bcrypt encryption for passwords\&. This is currently considered to be very secure\&.
@@ -80,7 +80,7 @@ Use bcrypt encryption for passwords\&. T
This flag is only allowed in combination with -B (bcrypt encryption)\&. It sets the computing time used for the bcrypt algorithm (higher is more secure but slower, default: 5, valid: 4 to 31)\&.
.TP
-d
-Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&.
+Use crypt() encryption for passwords\&. This is not supported by the httpd server on Windows and Netware\&. This algorithm limits the password length to 8 characters\&. This algorithm is \fBinsecure\fR by today's standards\&. It used to be the default algorithm until version 2\&.2\&.17\&.
.TP
-s
Use SHA encryption for passwords\&. Facilitates migration from/to Netscape servers using the LDAP Directory Interchange Format (ldif)\&. This algorithm is \fBinsecure\fR by today's standards\&.
Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.html.fr Sat Jul 6 21:48:19 2013
@@ -27,8 +27,6 @@
<p><span>Langues Disponibles: </span><a href="../en/mod/mod_lua.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="../fr/mod/mod_lua.html" title="Français"> fr </a></p>
</div>
-<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
- anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fournit des points d'entrée Lua dans différentes parties du
traitement des requêtes httpd</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Expérimental</td></tr>
@@ -724,7 +722,7 @@ r:flush() -- vide le tampon de sortie
while nous_avons_des_données_à_envoyer do
r:puts("Bla bla bla\n") -- envoi des données à envoyer vers le tampon
r:flush() -- vidage du tampon (envoi au client)
- r:sleep(0.5) -- mise en attente et bouclage
+ r.usleep(500000) -- mise en attente pendant 0.5 secondes et bouclage
end
</pre>
@@ -841,7 +839,7 @@ local url = r:construct_url(r.uri)
<pre class="prettyprint lang-lua">
-r:mpm_query(number) -- Interroge le serveur à propos de son
+r.mpm_query(number) -- Interroge le serveur à propos de son
module MPM via la requête ap_mpm_query.
local mpm = r.mpm_query(14)
@@ -1059,8 +1057,7 @@ local matches = r:regex("FOO bar BAz", [
<pre class="prettyprint lang-lua">
-r:sleep(secondes) -- Interrompt l'exécution du script pendant le nombre de secondes spécifié.
- -- La valeur peut être spécifiée sous la forme d'un nombre décimal comme 1.25 pour plus de précision.
+r.usleep(microsecondes) -- Interrompt l'exécution du script pendant le nombre de microsecondes spécifié.
</pre>
@@ -1130,18 +1127,14 @@ r:touch(file [,mtime]) -- Définit la da
r:get_direntries(dir) -- Renvoie une table contenant toutes les entrées de répertoires.
-- Renvoie un chemin sous forme éclatée en chemin, fichier, extension
-function split_path(path)
- return path:match("(.-)([^\\/]-%.?([^%.\\/]*))$")
-end
-
function handle(r)
- local cwd, _, _ = split_path(r.filename)
- for _, f in ipairs(r:get_direntries(cwd)) do
- local info = r:stat(cwd .. f)
+ local dir = r.context_document_root
+ for _, f in ipairs(r:get_direntries(dir)) do
+ local info = r:stat(dir .. "/" .. f)
if info then
local mtime = os.date(fmt, info.mtime / 1000000)
local ftype = (info.filetype == 2) and "[dir] " or "[file]"
- r:puts( ("%s %s %10i %s\n"):format(ftype, mtime, info.size, f) )
+ r:puts( ("%s %s %10i %s\n"):format(ftype, mtime, info.size, f) )
end
end
end
Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.meta Sat Jul 6 21:48:19 2013
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en (original)
+++ httpd/httpd/trunk/docs/manual/programs/htpasswd.html.en Sat Jul 6 21:48:19 2013
@@ -130,7 +130,8 @@ distribution.</li></ul><ul class="seeals
one) is omitted. It cannot be combined with the <code>-c</code> option.</dd>
<dt><code>-m</code></dt>
- <dd>Use MD5 encryption for passwords. This is the default.</dd>
+ <dd>Use MD5 encryption for passwords. This is the default (since version
+ 2.2.18).</dd>
<dt><code>-B</code></dt>
<dd>Use bcrypt encryption for passwords. This is currently considered to
@@ -145,7 +146,8 @@ distribution.</li></ul><ul class="seeals
<dd>Use <code>crypt()</code> encryption for passwords. This is not
supported by the <code class="program"><a href="../programs/httpd.html">httpd</a></code> server on Windows and
Netware. This algorithm limits the password length to 8 characters.
- This algorithm is <strong>insecure</strong> by today's standards.</dd>
+ This algorithm is <strong>insecure</strong> by today's standards.
+ It used to be the default algorithm until version 2.2.17.</dd>
<dt><code>-s</code></dt>
<dd>Use SHA encryption for passwords. Facilitates migration from/to Netscape
Modified: httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.ko?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.ko [euc-kr] Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:1465116 (outdated) -->
+<!-- English Revision: 105989:1500323 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.tr?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/programs/htpasswd.xml.tr [utf-8] Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1174747:1465116 (outdated) -->
+<!-- English Revision: 1174747:1500323 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/upgrading.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.html.fr?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.html.fr Sat Jul 6 21:48:19 2013
@@ -24,8 +24,6 @@
<p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="./fr/upgrading.html" title="Français"> fr </a></p>
</div>
-<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
- anglaise pour les changements récents.</div>
<p>Afin d'assister les utilisateurs lors de leurs opérations de mise à
jour, nous maintenons un document
@@ -378,24 +376,17 @@ Allow from example.org
module not included in the server configuration</code> - chargez
le module <code class="module"><a href="./mod/mod_access_compat.html">mod_access_compat</a></code>, ou mettez à jour
vers la version 2.4 les directives d'autorisation.</li>
- <li><code>mixing * ports and non-* ports with a NameVirtualHost address is not supported</code>, <code>Either NameVirtualHost w.x.y.z:n has no VirtualHosts, or there is more than one identical NameVirtualHost line, or your VirtualHost declarations do not match the NameVirtualHost line</code> - ces messages ne sont pas nouveaux, mais ils bloquent désormais le démarrage en générant une erreur</li>
-
- <li><code>_default_ is not allowed in NameVirtualHost directive</code> - ceci a toujours été le cas, mais à présent cette erreur bloque le démarrage du serveur.</li>
<li><code>Ignoring deprecated use of DefaultType in line NN of
/path/to/httpd.conf</code> - supprimez la directive <code class="directive"><a href="./mod/core.html#defaulttype">DefaultType</a></code> et remplacez-la par les
directives de configuration appropriées.</li>
- <li><code>mixing * ports and non-* ports with a NameVirtualHost
- address is not supported</code>, <code>Either NameVirtualHost
- w.x.y.z:n has no VirtualHosts, or there is more than one identical
- NameVirtualHost line, or your VirtualHost declarations do not
- match the NameVirtualHost line</code> -
- ce ne sont pas des nouveaux messages, mais ils empêchent
- maintenant le serveur de démarrer</li>
- <li><code>_default_ is not allowed in NameVirtualHost
- directive</code> - l'explication est dans le message ; cette
- définition n'a jamais été valide, mais elle empêche maintenant le
- serveur de démarrer.</li>
+
+ <li><code>Invalid command 'AddOutputFilterByType', perhaps misspelled
+ or defined by a module not included in the server configuration
+ </code> - la directive <code class="directive"><a href="./mod/mod_filter.html#addoutputfilterbytype">AddOutputFilterByType</a></code> qui était
+ jusqu'alors implémentée par le module core, l'est maintenant par
+ le module mod_filter, qui doit donc être chargé.</li>
+
</ul></li>
<li>Erreurs de traitement des requêtes :
<ul>
Modified: httpd/httpd/trunk/docs/manual/upgrading.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/upgrading.xml.meta?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/upgrading.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/upgrading.xml.meta Sat Jul 6 21:48:19 2013
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.html.fr Sat Jul 6 21:48:19 2013
@@ -28,8 +28,6 @@
<a href="../ko/vhosts/name-based.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> |
<a href="../tr/vhosts/name-based.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p>
</div>
-<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
- anglaise pour les changements récents.</div>
<p>Ce document décrit quand et comment utiliser des serveurs
virtuels par nom.</p>
@@ -137,6 +135,20 @@ virtuel basé sur le nom approprié</a><
spécifiques (et non par défaut).</p>
</div>
+ <div class="note"><h3>Hérirage du nom de serveur</h3>
+ <p>Il est toujours préférable de définir une directive <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> au niveau de chaque serveur
+ virtuel à base de nom. Si un serveur virtuel ne définit pas
+ de directive <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code>, le
+ nom de ce serveur virtuel sera hérité du serveur principal. Si
+ aucun nom de serveur n'a été explicitement défini au niveau du
+ serveur principal, le serveur tentera de déterminer son nom via
+ une résolution de nom DNS inverse sur la première adresse
+ d'écoute. Dans tous les cas, ce nom de serveur hérité influencera
+ la sélection du serveur virtuel à base de nom, c'est pourquoi il
+ est toujours préférable de définir une directive <code class="directive"><a href="../mod/core.html#servername">ServerName</a></code> pour chaque serveur virtuel
+ à base de nom.</p>
+ </div>
+
<p>Par exemple, supposez que vous hébergez le domaine
<code>www.example.com</code> et que vous souhaitez ajouter le
serveur virtuel <code>other.example.com</code> qui pointe sur
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.de Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 420990:1344675 (outdated) -->
+<!-- English Revision: 420990:1500042 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ja [utf-8] Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1344675 (outdated) -->
+<!-- English Revision: 420990:1500042 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.ko [euc-kr] Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='EUC-KR' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420990:1344675 (outdated) -->
+<!-- English Revision: 420990:1500042 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.meta Sat Jul 6 21:48:19 2013
@@ -9,7 +9,7 @@
<variants>
<variant outdated="yes">de</variant>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
<variant outdated="yes">tr</variant>
Modified: httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr?rev=1500326&r1=1500325&r2=1500326&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/vhosts/name-based.xml.tr [utf-8] Sat Jul 6 21:48:19 2013
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8' ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1301398:1344675 (outdated) -->
+<!-- English Revision: 1301398:1500042 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>