From: Guenter Knauf <fuankg@apache.org>
Date: Sun, 30 Jun 2013 21:09:10 +0000 (+0000)
Subject: Update.
X-Git-Tag: 2.4.5~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6c42e5a116d9ca4d3a63ed721c5f2123abebe11;p=apache

Update.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1498183 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index c800e63a73..5f7223276f 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -782,7 +782,7 @@ local url = r:construct_url(r.uri)
 
 
 <pre class="prettyprint lang-lua">
-r:mpm_query(number) -- Queries the server for MPM information using ap_mpm_query:
+r.mpm_query(number) -- Queries the server for MPM information using ap_mpm_query:
 
 local mpm = r.mpm_query(14)
 if mpm == 1 then
@@ -1033,19 +1033,14 @@ r:touch([mtime]) -- Sets the file modification time to current time or to option
 <pre class="prettyprint lang-lua">
 r:get_direntries(dir) -- Returns a table with all directory entries.
 
--- Return path splitted into components dir, file, ext
-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.fr b/docs/manual/mod/mod_lua.xml.fr
index ea4c668ece..1dc3b240c2 100644
--- a/docs/manual/mod/mod_lua.xml.fr
+++ b/docs/manual/mod/mod_lua.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1493935:1496483 (outdated) -->
+<!-- English Revision: 1493935:1498182 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->