www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
30,881 Commits 62 Branches 306 Tags
3cc71fb73dfbd85be74f1a8d63304bcc7186cc3d
Commit Graph

369 Commits

Author SHA1 Message Date
Christophe Jaillet
3e56c5b221 Fix some typos reported in PR 59998 
Most add already been fixed when PR 59990 had been applied on trunk. 

Thx klemens

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1827669 13f79535-47bb-0310-9956-ffa450edef68
 2018-03-24 20:05:19 +00:00
Joe Orton
212884210c * modules/lua/config.m4 (CHECK_LUA): Support Debian-style 
pkg-config naming for lua.

Reviewed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1826206 13f79535-47bb-0310-9956-ffa450edef68
 2018-03-08 11:27:48 +00:00
Joe Orton
7c00119df1 * modules/lua/config.m4: Use liblua paths from pkg-config if 
available.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1825147 13f79535-47bb-0310-9956-ffa450edef68
 2018-02-23 17:53:09 +00:00
Joe Orton
ecce8ad8cb * modules/lua/config.m4: Link mod_lua against -lcrypt if available, 
since mk_password_hash() can use crypt().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1822305 13f79535-47bb-0310-9956-ffa450edef68
 2018-01-26 15:00:28 +00:00
Rainer Jung
7ed2bd2e8b Fix another mod_lua compile error. 
Compilation now tested against Lus 5.1, 5.2
and 5.3. The libs were compiled with COMPAT
flags set, but mod_lua no longer sets them
so it should compile and run with non-COMPAT
libs as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800833 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 22:14:13 +00:00
Rainer Jung
fe1923bb91 Fix new compilation breakage in mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800830 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 21:48:41 +00:00
Rainer Jung
4b3557a8e9 Mostly revert the configure compat check for 
lua from r1785753. This should now no longer
be needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800819 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 20:49:53 +00:00
Rainer Jung
3490bd62b6 Fix last compat issue with Lua 5.2 and 5.3. 
Patch taken from PR58188 which picked it from
openSUSE.

Still needs testing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800817 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 20:48:43 +00:00
Rainer Jung
d98ec3b059 More mod_lua compat for Lua 5.1, 5.2, 5.3. 
One last use of luaL_register() with a non-NULL
"name" argument remaining.

Not tested yet.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800815 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 20:35:06 +00:00
Rainer Jung
d1105fd4f2 mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3. 
PR58188, PR60831, PR61245.

Still to solve: replace uses of luaL_register().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1800809 13f79535-47bb-0310-9956-ffa450edef68
 2017-07-04 19:22:23 +00:00
Jacob Champion
00949c61e3 configure: check for luaL_register in liblua 
This is a temporary workaround for a missing compatibility API on
Debian-like systems (and anyone else who doesn't compile with
LUA_COMPAT_MODULE). Ignore any such libraries so we don't fail
confusingly later.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785753 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-06 19:49:23 +00:00
Jacob Champion
4a720ae368 configure: remove mod_lua code duplication 
Pull identical code into the CHECK_LUA_PATH macro.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785752 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-06 19:49:21 +00:00
Jim Jagielski
52112325c0 Look for specific versioned installs of Lua 5.3 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1785115 13f79535-47bb-0310-9956-ffa450edef68
 2017-03-02 12:26:26 +00:00
Christophe Jaillet
e6459db019 Save a few bytes in the request pool. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1783057 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-15 03:52:57 +00:00
Jim Jagielski
cc97ce3e52 https://bz.apache.org/bugzilla/show_bug.cgi?id=58855 
Optimize check for empty strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 22:08:01 +00:00
Christophe Jaillet
4b509440bc Unlock mutex in error path. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776006 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-25 11:11:30 +00:00
Christophe Jaillet
e149a8d8d0 Fix some style issue. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772490 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-03 21:59:55 +00:00
Christophe Jaillet
cd677cee0c The default value of 'inherit' should be AP_LUA_INHERIT_UNSET. 
With this value, the behavior is the same as 'parent-first' in the 'LuaInherit' directive

If not explicitelly initialized, its value is 0 because of the 'apr_calloc 'in 'create_dir_config'. 0 means 'AP_LUA_INHERIT_NONE'

PR 60419

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1772489 13f79535-47bb-0310-9956-ffa450edef68
 2016-12-03 21:37:52 +00:00
Rainer Jung
d79b514c4b Fix spelling in comments and text files. 
No functional change.
PR 59990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
 2016-08-11 19:50:02 +00:00
Joe Orton
bf5205907b * modules/lua/mod_lua.c (lua_post_config): Use anonymous shm segment 
in preference to named segment.  Ensure startup is possible after an
  unclean shutdown.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1738229 13f79535-47bb-0310-9956-ffa450edef68
 2016-04-08 11:02:14 +00:00
Rainer Jung
f439615d29 Fix typo in comment (s/patterm/pattern/). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1726086 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-21 20:13:58 +00:00
Rainer Jung
0eddea67ac Added some more log numbers to log statements that 
had none.

Those were not detected by the coccinelle script.
Only a few hard cases are remaining now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725548 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 15:43:17 +00:00
Rainer Jung
af14d158a3 Added many log numbers to log statements that 
had none.

Those were not detected by the coccinelle script.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725485 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 12:02:41 +00:00
Rainer Jung
44ce30494e Added many log numbers to log statements that 
had none.

Handled all files in modules/.

I used the coccinelle script provided by Stefan.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725392 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 00:03:18 +00:00
Daniel Gruno
cfabdeb78e Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1706533 13f79535-47bb-0310-9956-ffa450edef68
 2015-10-03 09:45:20 +00:00
Christophe Jaillet
68131d85a4 Fix some style issues on files that can easily be synch'ed with 2.4.x 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705983 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-30 08:35:35 +00:00
Jim Jagielski
0116b86611 accept both 5.1 and 5.2, so make messages clear 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703642 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-17 15:01:38 +00:00
Jim Jagielski
ca5279532e Add in finding LUA installed via Macports and others 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1703417 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-16 14:42:35 +00:00
Daniel Gruno
e8ea4c9a72 just a note 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698339 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 14:39:53 +00:00
Daniel Gruno
e76410a124 we have this nwo, don't we? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698338 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 14:31:22 +00:00
Daniel Gruno
21ff8a24ca tiny nit. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1698256 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-28 03:53:25 +00:00
William A. Rowe Jr
70065c297b Drop redundant and harmful macro, API change correctly toggled in mod_lua.c 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697966 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-26 16:17:41 +00:00
Jan Kaluža
eca303e318 * mod_lua: fix compilation with lua-5.3 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1668827 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-24 09:13:12 +00:00
Eric Covener
6c0cf71485 followup to r1657261 whitespace only -- reindent body of while loop. 
(no change under svn diff -x-w)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657263 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:52:50 +00:00
Eric Covener
78eb3b9235 *) SECURITY: CVE-2015-0228 (cve.mitre.org) 
mod_lua: A maliciously crafted websockets PING after a script
     calls r:wsupgrade() can cause a child process crash.
     [Edward Lu <Chaosed0 gmail.com>]

Discovered by Guido Vranken <guidovranken gmail.com>

Submitted by: Edward Lu
Committed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657261 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:44:23 +00:00
Eric Covener
8f40799093 Fix bit-shifting of websockets frame fields that would yield wrong opcodes 
when the FIN bit was set.  Results in PING not being recognized
by mod_lua.  PR57524

Submitted By: Edward Lu
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657256 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-04 14:33:51 +00:00
Guenter Knauf
53e7998820 Enable to build mod_lua against Lua 5.3. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1652886 13f79535-47bb-0310-9956-ffa450edef68
 2015-01-19 00:35:25 +00:00
Daniel Gruno
918199724a now it's actually fixed (The URL) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643272 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:33:10 +00:00
Daniel Gruno
08a314456f fixed it! 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643271 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:32:00 +00:00
Daniel Gruno
3d61019b90 another blank commit... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643269 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:29:37 +00:00
Daniel Gruno
4d26c4006b another blank change, ignore. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643265 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:08:16 +00:00
Daniel Gruno
320ddfecdb more blank changes to set up viewvc, ignore. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643263 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:02:10 +00:00
Daniel Gruno
8916eba91a blank change to test commit mail URL is properly working. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643258 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 12:49:23 +00:00
Daniel Gruno
e27d5d9480 testing eu <-> us sync 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643147 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 01:28:25 +00:00
Daniel Gruno
d28e6f8a30 more noise again 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643146 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 01:06:05 +00:00
Daniel Gruno
3d429ab1e3 more tests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643142 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 00:40:04 +00:00
Daniel Gruno
c66f9774c9 bit more noise... (still testing) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643141 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 00:22:44 +00:00
Daniel Gruno
2c70fbc07c more tests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643137 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:58:51 +00:00
Daniel Gruno
f4dfabcd1b trying eu svn... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643130 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:51:16 +00:00
Daniel Gruno
ff8c2ca60b More dead birds in the sky...is it summer already? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643129 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:48:28 +00:00