xforms

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

8 files changed, 49 insertions, 5 deletions

diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta
index ea324a8bb2..d5a2e5e1a5 100644
--- a/docs/manual/expr.xml.meta
+++ b/docs/manual/expr.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index f669e5d221..2ad2d3499d 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -141,6 +141,10 @@ function handle(r)
         for k, v in pairs( r:parseargs() ) do
             r:puts( string.format("%s: %s\n", k, v) )
         end
+    elseif r.method == 'POST' then
+        for k, v in pairs( r:parsebody() ) do
+            r:puts( string.format("%s: %s\n", k, v) )
+        end
     else
         r:puts("Unsupported HTTP method " .. r.method)
     end
@@ -451,6 +455,11 @@ end
         r:parseargs() -- returns a lua table containing the request's query string arguments
         </pre>
 
+        <pre class="prettyprint lang-lua">
+        r:parsebody([sizeLimit]) -- parse the request body as a POST and return  a lua table.
+                                 -- An optional number may be passed to specify the maximum number 
+                                 -- of bytes to parse. Default is 8192 bytes.
+        </pre>
 
         <pre class="prettyprint lang-lua">
         r:puts("hello", " world", "!") -- print to response body
diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index 35f406ba04..21811ec856 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: 1345920:1374252 (outdated) -->
+<!-- English Revision: 1345920:1375911 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_privileges.html.en b/docs/manual/mod/mod_privileges.html.en
index 33641b81ed..7154599e1d 100644
--- a/docs/manual/mod/mod_privileges.html.en
+++ b/docs/manual/mod/mod_privileges.html.en
@@ -160,6 +160,7 @@ non-threaded MPMs (<code class="module"><a href="../mod/prefork.html">prefork</a
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Trade off processing speed and efficiency vs security against
 malicious privileges-aware code.</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>PrivilegesMode FAST|SECURE|SELECTIVE</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>PrivilegesMode FAST</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_privileges</td></tr>
diff --git a/docs/manual/mod/mpm_winnt.html.en b/docs/manual/mod/mpm_winnt.html.en
index d388f745fe..8e5fef02de 100644
--- a/docs/manual/mod/mpm_winnt.html.en
+++ b/docs/manual/mod/mpm_winnt.html.en
@@ -60,6 +60,40 @@ NT.</td></tr>
     <code>none</code>.  <em>In Apache httpd 2.0 and 2.2,
     <code class="directive">Win32DisableAcceptEx</code> was used for this purpose.</em></p>
 
+    <p>The WinNT MPM differs from the Unix MPMs such as worker and event
+    in several areas:</p>
+
+    <ul>
+      <li>When a child process is exiting due to shutdown, restart, or
+      <code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>,
+      active requests in the exiting process have
+      <code class="directive"><a href="../mod/core.html#timeout">TimeOut</a></code> seconds to finish before
+      processing is aborted.  Alternate types of restart and shutdown are not
+      implemented.</li>
+
+      <li>New child processes read the configuration files instead of
+      inheriting the configuration from the parent.  The behavior will
+      be the same as on Unix if the child process is created at startup
+      or restart, but if a child process is created because the prior
+      one crashed or reached 
+      <code class="directive"><a href="../mod/mpm_common.html#maxconnectionsperchild">MaxConnectionsPerChild</a></code>,
+      any pending changes to the configuration will become active in the
+      child at that point, and the parent and child will be using a
+      different configuration.  If planned configuration changes have been
+      partially implemented and the current configuration cannot be
+      parsed, the replacement child process cannot start up and the server 
+      will halt.  Because of this behavior, configuration files should not
+      be changed until the time of a server restart.</li>
+
+      <li>The <code>monitor</code> and <code>fatal_exception</code> hooks
+      are not currently implemented.</li>
+
+      <li><code class="directive">AcceptFilter</code> is implemented in the MPM
+      and has a different type of control over handling of new connections.
+      (Refer to the <code class="directive"><a href="../mod/core.html#acceptfilter">AcceptFilter</a></code>
+      documentation for details.)</li>
+    </ul>
+
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
diff --git a/docs/manual/mod/mpm_winnt.xml.de b/docs/manual/mod/mpm_winnt.xml.de
index acc8a1933d..79cf99c2b2 100644
--- a/docs/manual/mod/mpm_winnt.xml.de
+++ b/docs/manual/mod/mpm_winnt.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 420990:1374572 (outdated) -->
+<!-- English Revision: 420990:1375007 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mpm_winnt.xml.ja b/docs/manual/mod/mpm_winnt.xml.ja
index 0bd0fb561e..95bf13daed 100644
--- a/docs/manual/mod/mpm_winnt.xml.ja
+++ b/docs/manual/mod/mpm_winnt.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 420990:1374572 (outdated) -->
+<!-- English Revision: 420990:1375007 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 7e2b53c075..0a67661574 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -630,7 +630,7 @@ evaluated.</td></tr>
 ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Passes environment variables from the shell</td></tr>
 <tr><td><a href="mpm_common.html#pidfile">PidFile <var>filename</var></a></td><td> logs/httpd.pid </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">File where the server records the process ID
 of the daemon</td></tr>
-<tr class="odd"><td><a href="mod_privileges.html#privilegesmode">PrivilegesMode FAST|SECURE|SELECTIVE</a></td><td></td><td>svd</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Trade off processing speed and efficiency vs security against
+<tr class="odd"><td><a href="mod_privileges.html#privilegesmode">PrivilegesMode FAST|SECURE|SELECTIVE</a></td><td> FAST </td><td>svd</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Trade off processing speed and efficiency vs security against
 malicious privileges-aware code.</td></tr>
 <tr><td><a href="core.html#protocol">Protocol <var>protocol</var></a></td><td></td><td>sv</td><td>C</td></tr><tr><td class="descr" colspan="4">Protocol for a listening socket</td></tr>
 <tr class="odd"><td><a href="mod_echo.html#protocolecho">ProtocolEcho On|Off</a></td><td> Off </td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Turn the echo server on or off</td></tr>