*) mod_lua: Make r.ap_auth_type writable

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

diff --git a/STATUS b/STATUS
index d6b811c8bcf28f46ff32c8c27873c6e644b3bc90..b00ce2df0936ca9b614b060e4b8d8f84a8147396 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -157,10 +157,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_lua: Make r.ap_auth_type writable
-     trunk patch: https://svn.apache.org/r1921260
-     2.4.x patch: svn merge -c 1921260 ^/httpd/httpd/trunk .
-     +1: jorton, covener, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/changes-entries/pr62497.txt b/changes-entries/pr62497.txt
new file mode 100644 (file)
index 0000000..c4f555d
--- /dev/null
+++ b/changes-entries/pr62497.txt
@@ -0,0 +1,2 @@
+  *) mod_lua: Make r.ap_auth_type writable.  PR 62497.
+     [Michael Osipov <michaelo apache.org>]

diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml
index 75330deeeb35bd3908843bb2fa2b8f78e785d25f..9ea35c9996c91aaed47b94656752e40c8d35744c 100644 (file)
--- a/docs/manual/mod/mod_lua.xml
+++ b/docs/manual/mod/mod_lua.xml
@@ -360,7 +360,7 @@ end
         <tr>
           <td><code>ap_auth_type</code></td>
           <td>string</td>
-          <td>no</td>
+          <td>yes</td>
           <td>If an authentication check was made, this is set to the type 
           of authentication (f.x. <code>basic</code>)</td>
         </tr>

diff --git a/docs/manual/mod/mod_lua.xml.fr b/docs/manual/mod/mod_lua.xml.fr
index 50b104ba91d68ed423d60aad95e894b3b8c26d77..d7f524972e090f1a02140f0a9dfe8eb5b988ef91 100644 (file)
--- a/docs/manual/mod/mod_lua.xml.fr
+++ b/docs/manual/mod/mod_lua.xml.fr
@@ -383,7 +383,7 @@ end
         <tr>
           <td><code>ap_auth_type</code></td>
           <td>string</td>
-          <td>non</td>
+          <td>oui</td>
          <td>Ce champ contient le type d'authentification effectuée
          (par exemple <code>basic</code>)</td>
         </tr>

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index cfb89b80cabb95360801a9a2ef93026919ca95c8..689780da46e64a83563a0140e4a3446cce1dd6da 100644 (file)
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -2551,6 +2551,12 @@ static int req_newindex(lua_State *L)
     request_rec *r = ap_lua_check_request_rec(L, 1);
     key = luaL_checkstring(L, 2);
 
+    if (0 == strcmp("ap_auth_type", key)) {
+        const char *value = luaL_checkstring(L, 3);
+        r->ap_auth_type = apr_pstrdup(r->pool, value);
+        return 0;
+    }
+
     if (0 == strcmp("args", key)) {
         const char *value = luaL_checkstring(L, 3);
         r->args = apr_pstrdup(r->pool, value);