1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

16 Commits

Author SHA1 Message Date
Jim Jagielski
1f3956473e Merge r1611978, r1612068 from trunk:
Add missing APLOGNO.
Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

Add missing APLOGNO.
Refactor some lines to keep APLOGNO on the same line as ap_log_error, when applicable.
Split lines longer than 80.
Improve alignment.
Submitted by: jailletc36
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1622706 13f79535-47bb-0310-9956-ffa450edef68
2014-09-05 14:20:27 +00:00
Daniel Gruno
707e187891 mod_lua: Give me all the backports and eggs you have. (see CHANGES)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582968 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 09:15:33 +00:00
Daniel Gruno
1486d67e26 mod_lua: Prevent HTTP Response Splitting by not allowing tables in the request_rec to be set with values containing newlines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1582264 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 11:22:33 +00:00
Graham Leggett
378f774ab1 mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700):
2.4.x patch: http://www.humbedooh.com/mod_lua_2013_06_07.patch
Submitted by: humbedooh
Reviewed by: fuankg, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491468 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 14:36:56 +00:00
Graham Leggett
04bd9d4b2f mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)
Server pools, new apr functions for the request_rec table, input/output filters,
LuaCodeCache, LuaMapHandler and multipart form data handling. This is long
overdue, and has become too spaghetti-ish to propose in chunks :|

trunk patch: http://svn.apache.org/r1366890
             http://svn.apache.org/r1367025
             http://svn.apache.org/r1367040
             http://svn.apache.org/r1367048
             http://svn.apache.org/r1383024
             http://svn.apache.org/r1383028
             http://svn.apache.org/r1383037
             http://svn.apache.org/r1367725
             http://svn.apache.org/r1367875
             http://svn.apache.org/r1368109
             http://svn.apache.org/r1369656
             http://svn.apache.org/r1369793
             http://svn.apache.org/r1369800
             http://svn.apache.org/r1370158
             http://svn.apache.org/r1433967
             http://svn.apache.org/r1429169
             http://svn.apache.org/r1425450
             http://svn.apache.org/r1425243
             http://svn.apache.org/r1422552
             http://svn.apache.org/r1422548
             http://svn.apache.org/r1422531
             http://svn.apache.org/r1422373
             http://svn.apache.org/r1422072
             http://svn.apache.org/r1421784
             http://svn.apache.org/r1421780
             (the list goes on...)
    2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES)

Submitted by: humbedooh
Reviewed by: jim, covener, fuankg


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1490599 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 11:51:28 +00:00
Rainer Jung
a6a102f9d8 Improve Lua 5.2.0 compatibility.
This is not yet complete. Building should
still work with Lua 5.1.4, but needs
-DLUA_COMPAT_ALL in CPPFLAGS when compiled
against 5.2.0. Automatically handling
this in configure is still a TODO.

Backport from trunk of the following revisions:

r1221205: Make mod_lua compile with lua 5.2.x.
MOdified patch submitted by NormW (nornw gknw net).

r1239029: luaL_reg was already deprecated in Lua 5.1.4.
It is gone in Lua 5.2.0 and was replaced by luaL_Reg
which already existed in 5.1.4. So use that one.

r1239030: Remove luaL_reg macro definition no longer needed
and simplify lua_load compatibility macro.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1239120 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 13:17:46 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
William A. Rowe Jr
a38b9f9117 Not static; trusting this targetted for export?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808726 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:39:50 +00:00
Brian McCallister
c194519800 change use of luaL_openlib to luaL_register via path from Arfrever Frehtes Taifersar Arahesis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@784644 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 03:10:06 +00:00
Brian McCallister
3268b2daf4 change use of luaL_openlib to luaL_register via path from Arfrever Frehtes Taifersar Arahesis
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@784643 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 03:10:03 +00:00
William A. Rowe Jr
aa4b1cff0b fix symbol space and exports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758428 13f79535-47bb-0310-9956-ffa450edef68
2009-03-25 20:09:08 +00:00
Brian McCallister
0f4cf6e591 changes headers_in and headers_out handling in mod_lua to map apr_table_t instances as boxed pointers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@737293 13f79535-47bb-0310-9956-ffa450edef68
2009-01-24 03:10:40 +00:00
Paul Querna
ce336c773a Attempt to make mod_lua compile under a strict c89 compiler by moving all variable declarations to be before code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728539 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 22:38:07 +00:00
Paul Querna
729bcf2b58 Reformat mod_lua according to the HTTP Server Project C Style Guide:
<http://httpd.apache.org/dev/styleguide.html>
No functional changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728516 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 21:41:52 +00:00
Paul Querna
41fa7d796a Include standard ASF license block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728512 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 21:32:04 +00:00
Paul Querna
3948867f51 Rename all files in mod_lua to have a lua_ prefix, as things like 'config.h' are way to generic and will often conflict with other include files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728508 13f79535-47bb-0310-9956-ffa450edef68
2008-12-21 21:27:01 +00:00