From 3e635822af726f79d85b59c3087e6bd5654e9eaa Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 6 Jul 2013 21:51:24 +0000 Subject: [PATCH] xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1500328 13f79535-47bb-0310-9956-ffa450edef68 --- docs/man/htpasswd.1 | 6 ++--- docs/manual/developer/new_api_2_4.html.en | 4 +++ docs/manual/mod/mod_lua.html.fr | 29 +++++++++++++--------- docs/manual/mod/mod_lua.xml.meta | 2 +- docs/manual/mod/mod_ssl.html.fr | 4 ++- docs/manual/programs/htpasswd.html.en | 6 +++-- docs/manual/programs/htpasswd.html.fr | 2 ++ docs/manual/programs/htpasswd.xml.fr | 2 +- docs/manual/programs/htpasswd.xml.ko | 2 +- docs/manual/programs/htpasswd.xml.meta | 2 +- docs/manual/programs/htpasswd.xml.tr | 2 +- docs/manual/programs/suexec.html.tr.utf8 | 1 + docs/manual/programs/suexec.xml.ko | 2 +- docs/manual/programs/suexec.xml.meta | 2 +- docs/manual/programs/suexec.xml.tr | 2 +- docs/manual/upgrading.html.fr | 22 ++++------------ docs/manual/upgrading.xml.meta | 2 +- docs/manual/vhosts/name-based.html.fr | 16 ++++++++++++ docs/manual/vhosts/name-based.html.tr.utf8 | 1 + docs/manual/vhosts/name-based.xml.de | 2 +- docs/manual/vhosts/name-based.xml.fr | 2 +- docs/manual/vhosts/name-based.xml.ja | 2 +- docs/manual/vhosts/name-based.xml.ko | 2 +- docs/manual/vhosts/name-based.xml.meta | 4 +-- docs/manual/vhosts/name-based.xml.tr | 2 +- 25 files changed, 72 insertions(+), 51 deletions(-) diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index 9ff3a6f464..db54c116cf 100644 --- a/docs/man/htpasswd.1 +++ b/docs/man/htpasswd.1 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "HTPASSWD" 1 "2013-04-30" "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 \fIpasswdfile\fR already exists, it is rewritt 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\&. This is currently considered to be very s 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\&. diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en index 137bdbd5b3..ba10c06ec1 100644 --- a/docs/manual/developer/new_api_2_4.html.en +++ b/docs/manual/developer/new_api_2_4.html.en @@ -493,6 +493,10 @@
unixd_config
This has been renamed to ap_unixd_config.
+
unixd_setup_child()
+
This has been renamed to ap_unixd_setup_child(), but most callers + should call the added ap_run_drop_privileges() hook.
+
conn_rec->remote_ip and conn_rec->remote_addr
These fields have been renamed in order to distinguish between diff --git a/docs/manual/mod/mod_lua.html.fr b/docs/manual/mod/mod_lua.html.fr index 2ceb2f164d..ed9b608e7f 100644 --- a/docs/manual/mod/mod_lua.html.fr +++ b/docs/manual/mod/mod_lua.html.fr @@ -722,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 @@ -839,7 +839,7 @@ local url = r:construct_url(r.uri) 
-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)
@@ -1057,8 +1057,7 @@ local matches = r:regex("FOO bar BAz", [[(foo) bar]], 1)
 
 
 
-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é.
 

 
 
@@ -1109,27 +1108,33 @@ r:mkdir(dir [,mode]) -- Cr
+
+r:mkrdir(dir [,mode]) -- Crée des répertoires de manière récursive et définit leur mode via le paramètre optionnel mode.
+
+ + 
 r:rmdir(dir) -- Supprime un répertoire.
+
+r:touch([mtime]) -- Définit la date de modification d'un fichier à la date courante ou à la valeur optionnelle mtime en msec.
+
+ + 
 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
diff --git a/docs/manual/mod/mod_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta
index 8fc1a0efdf..b55c7710e9 100644
--- a/docs/manual/mod/mod_lua.xml.meta
+++ b/docs/manual/mod/mod_lua.xml.meta
@@ -8,6 +8,6 @@
 
   
     en
-    fr
+    fr
   
 
diff --git a/docs/manual/mod/mod_ssl.html.fr b/docs/manual/mod/mod_ssl.html.fr
index 79cbafb66e..34da8b32fc 100644
--- a/docs/manual/mod/mod_ssl.html.fr
+++ b/docs/manual/mod/mod_ssl.html.fr
@@ -1624,7 +1624,7 @@ requ
 code d'état 502 (Bad Gateway) est envoyé.
 

 

-SSLProxyCheckPeerCN a été remplacé par SSLProxyCheckPeerName, et sa définition
+A partir de la version 2.4.5, SSLProxyCheckPeerCN a été remplacé par SSLProxyCheckPeerName, et sa définition
 n'est prise en compte que si SSLProxyCheckPeerName off a
 été spécifié.
 

@@ -1668,6 +1668,8 @@ certificats serveur distants
 Contexte:configuration du serveur, serveur virtuel
 Statut:Extension
 Module:mod_ssl
+Compatibilité:Disponible à partir de la version 2.4.5 du serveur HTTP
+Apache
 
 

 Cette directive permet de configurer la vérification du nom d'hôte dans
diff --git a/docs/manual/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en
index e6bf6ecf97..dc15499b66 100644
--- a/docs/manual/programs/htpasswd.html.en
+++ b/docs/manual/programs/htpasswd.html.en
@@ -131,7 +131,8 @@ distribution.
-m
-
Use MD5 encryption for passwords. This is the default.
+
Use MD5 encryption for passwords. This is the default (since version + 2.2.18).
-B
Use bcrypt encryption for passwords. This is currently considered to @@ -146,7 +147,8 @@ distribution.
-s
Use SHA encryption for passwords. Facilitates migration from/to Netscape diff --git a/docs/manual/programs/htpasswd.html.fr b/docs/manual/programs/htpasswd.html.fr index 3a9671e08f..b8553f84f7 100644 --- a/docs/manual/programs/htpasswd.html.fr +++ b/docs/manual/programs/htpasswd.html.fr @@ -28,6 +28,8 @@ l'authentification de base  ko  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

htpasswd permet de créer et de maintenir les fichiers textes où sont stockés les noms d'utilisateurs et mots de diff --git a/docs/manual/programs/htpasswd.xml.fr b/docs/manual/programs/htpasswd.xml.fr index c3eb125160..baaec3d9f3 100644 --- a/docs/manual/programs/htpasswd.xml.fr +++ b/docs/manual/programs/htpasswd.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/programs/htpasswd.xml.ko b/docs/manual/programs/htpasswd.xml.ko index 9558d299e8..50a2a8ca11 100644 --- a/docs/manual/programs/htpasswd.xml.ko +++ b/docs/manual/programs/htpasswd.xml.ko @@ -1,7 +1,7 @@ - + + + + + + diff --git a/docs/manual/vhosts/name-based.xml.ja b/docs/manual/vhosts/name-based.xml.ja index 6190ec089d..724f0f951a 100644 --- a/docs/manual/vhosts/name-based.xml.ja +++ b/docs/manual/vhosts/name-based.xml.ja @@ -1,7 +1,7 @@ - + + +