From: Stefan Fritsch Date: Sat, 6 Jul 2013 21:48:19 +0000 (+0000) Subject: xforms X-Git-Tag: 2.5.0-alpha~5263 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5c5d694694ad8468e7d6f08b323e8e37f489966;p=apache xforms git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1500326 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/man/htpasswd.1 b/docs/man/htpasswd.1 index db094c7b71..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-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 \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/mod/mod_lua.html.fr b/docs/manual/mod/mod_lua.html.fr index 9faa89a161..6689ea16c2 100644 --- a/docs/manual/mod/mod_lua.html.fr +++ b/docs/manual/mod/mod_lua.html.fr @@ -27,8 +27,6 @@

Langues Disponibles:  en  |  fr 

-
Cette traduction peut être périmée. Vérifiez la version - anglaise pour les changements récents.
@@ -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 @@ -841,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)
@@ -1059,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é.
 

 
 
@@ -1130,18 +1127,14 @@ r:touch(file [,mtime]) -- D
 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/programs/htpasswd.html.en b/docs/manual/programs/htpasswd.html.en
index f714fed20e..046accb463 100644
--- a/docs/manual/programs/htpasswd.html.en
+++ b/docs/manual/programs/htpasswd.html.en
@@ -130,7 +130,8 @@ distribution.
Description:Fournit des points d'entrée Lua dans différentes parties du traitement des requêtes httpd
Statut:Expérimental