From: Jeff Trawick <trawick@apache.org>
Date: Sat, 4 Aug 2012 20:32:50 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~6515
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcefa979ad92a01cc06f3edb98333eef8c190c79;p=thirdparty%2Fapache%2Fhttpd.git

xforms


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369428 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/developer/new_api_2_4.html.en b/docs/manual/developer/new_api_2_4.html.en
index 70fc54809f1..0ff848f0725 100644
--- a/docs/manual/developer/new_api_2_4.html.en
+++ b/docs/manual/developer/new_api_2_4.html.en
@@ -436,6 +436,14 @@
           would not have had a chance to enable support for this
           function.</dd>
 
+      <dt><code>ap_requires()</code></dt>
+      <dd>The core server now provides better infrastructure for handling
+          <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code> configuration.
+          Register an auth provider function for each supported entity using
+          <code>ap_register_auth_provider()</code>.  The function will be
+          called as necessary during <code class="directive">Require</code>
+          processing.  (Consult bundled modules for detailed examples.)</dd>
+
       <dt><code>ap_server_conf-&gt;process-&gt;pool</code>
       userdata</dt>
       <dd>
@@ -545,6 +553,15 @@
 
     <dt>Implement cleanups which clear pointer variables</dt>
     <dd>Use <code>ap_pool_cleanup_set_null()</code>.</dd>
+
+    <dt>Create run-time files such as shared memory files, pid files,
+    etc.</dt>
+    <dd>Use <code>ap_runtime_dir_relative()</code> so that the global
+    configuration for the location of such files, either by the
+    DEFAULT_REL_RUNTIMEDIR compile setting or the
+    <code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code> directive,
+    will be respected.  <em>Apache httpd 2.4.2 and above.</em></dd>
+
     </dl>
   
 
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index fd9deefd161..57dc97effee 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -261,9 +261,9 @@ performing access control, or setting mimetypes:</p>
     </tr>
 <tr class="odd">
         <td>Check Access</td>
-        <td><code class="directive"><a href="#luahookauthchecker">LuaHookAuthChecker</a></code> or <code class="directive"><a href="#luaauthzprovider">LuaAuthzProvider</a></code></td>
-        <td>This phase authenticates and grants or denies access to the 
-            requested resource</td>
+        <td><code class="directive"><a href="#luahookaccesschecker">LuaHookAccessChecker</a></code></td>
+        <td>This phase checks whether a client has access to a resource. This 
+            phase is run before the user is authenticated, so beware.</td>
     </tr>
 <tr>
         <td>Check User ID</td>
@@ -271,24 +271,32 @@ performing access control, or setting mimetypes:</p>
         <td>This phase it used to check the negotiated user ID</td>
     </tr>
 <tr class="odd">
+        <td>Check Authorization</td>
+        <td><code class="directive"><a href="#luahookauthchecker">LuaHookAuthChecker</a></code> or 
+            <code class="directive"><a href="#luaauthzprovider">LuaAuthzProvider</a></code></td>
+        <td>This phase authorizes a user based on the negotiated credentials, such as 
+            user ID, client certificate etc.
+        </td>
+    </tr>
+<tr>
         <td>Check Type</td>
         <td><code class="directive"><a href="#luahooktypechecker">LuaHookTypeChecker</a></code></td>
         <td>This phase checks the requested file and assigns a content type and 
             a handler to it</td>
     </tr>
-<tr>
+<tr class="odd">
         <td>Fixups</td>
         <td><code class="directive"><a href="#luahookfixups">LuaHookFixups</a></code></td>
         <td>This is the final "fix anything" phase before the content handlers 
             are run. Any last-minute changes to the request should be made here.</td>
     </tr>
-<tr class="odd">
+<tr>
         <td>Content handler</td>
         <td>fx. <code>.lua</code> files or through <code class="directive"><a href="#luamaphandler">LuaMapHandler</a></code></td>
         <td>This is where the content is handled. Files are read, parsed, some are run, 
             and the result is sent to the client</td>
     </tr>
-<tr>
+<tr class="odd">
         <td>Logging</td>
         <td>(none)</td>
         <td>Once a request has been handled, it enters several logging phases, 
diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index ae68c659ffe..110b66e7ed2 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: 1355934:1368642 (outdated) -->
+<!-- English Revision: 1355934:1369299 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->