www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity
34,172 Commits 62 Branches 304 Tags
trunk
Commit Graph

56 Commits

Author SHA1 Message Date
Christophe Jaillet
e10f5c32c0 Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should have the following prototype: 
apr_status_t (*apr_reslist_destructor)(void *resource, void *params, apr_pool_t *pool);

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1834226 13f79535-47bb-0310-9956-ffa450edef68
 2018-06-23 21:52:09 +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
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
266b5a6438 fix message number 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578882 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 13:40:03 +00:00
Daniel Gruno
8ae204c9b0 mod_lua: Actually check whether interpreting the base structure of a file works or not, don't just assume it works. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1578870 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-18 13:32:36 +00:00
Daniel Gruno
5a2ba0a377 mod_lua: Use a (new) global pool/mutex setup for IVM rather than a per-process pool. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1526906 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 13:56:53 +00:00
Guenter Knauf
4e7640be1d Remove unneeded exports from mod_lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487956 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 18:28:24 +00:00
Guenter Knauf
7557b6066f Provide proper module extension. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1487769 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-30 06:58:19 +00:00
Daniel Gruno
c1f9c7546f - return NULL if apr_reslist_acquire fails, so we don't end up possibly referencing a null-object 
- initialize cache_info as NULL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1424939 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-21 14:53:55 +00:00
Daniel Gruno
ef9056a534 lua_vmprep.c: Additional check to see if the resource list was successfully created, so we don't end up trying to fetch a non-existent resource list when we use the 'server' option for the LuaScope directive. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420181 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 14:11:41 +00:00
Christophe Jaillet
940259c95d No need to test for NULL before calling apr_pstrdup. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1398025 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-14 06:54:36 +00:00
Stefan Fritsch
29e93a99b2 another style fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383037 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 18:49:03 +00:00
Stefan Fritsch
5eddb6d978 more coding style (no logic change) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383028 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 18:37:23 +00:00
Stefan Fritsch
7f15aa7251 coding style 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383024 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 18:30:06 +00:00
Stefan Fritsch
77e7551062 Fix warnings about unused variable and (false positive) "'mkey' may be used uninitialized in this function" 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383022 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 18:25:17 +00:00
Stefan Fritsch
533878b7c7 Replace duplicate log msg numbers 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383013 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-10 18:06:48 +00:00
Jeff Trawick
93111a7645 fix "lua_vmprep.c:355:17: warning: no previous prototype for ‘copy_vm_spec’ [-Wmissing-prototypes]" 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369793 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 11:48:46 +00:00
Daniel Gruno
25fa9a1809 Reverting r1369758 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369763 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 09:52:50 +00:00
Daniel Gruno
864e336ee3 use the ap_mutex functions to create the mutex instead of the apr_mutex ones. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369758 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 09:26:10 +00:00
Daniel Gruno
b598e862d3 Add a server scope for Lua states (in LuaScope), which creates a pool of states with manageable minimum and maximum size. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369656 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-05 19:57:44 +00:00
Daniel Gruno
c67acaa6fc mod_lua: Pass on the request_rec to ap_lua_get_lua_state, so we can use it for allocating memory for the cache info lookup. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1367040 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-30 09:06:41 +00:00
Daniel Gruno
c0cc85a065 mod_lua: Fix up LuaCodeCache: 
- Check both mtime and size of a file when comparing with cache, in case the file is being written to while read
- If LuaCodeCache is 'never', only reload it if it has been run once or more.
- Never use cache if LuaScope is 'once'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1367025 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-30 08:19:14 +00:00
Daniel Gruno
f9b07d1b34 Add LuaCodeCache directive for controlling in-memory caching. 
This might need some tweaking on the hash key generation for the mtime lookups, ideas are welcome.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1366890 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-29 19:07:38 +00:00
Rainer Jung
bfbbc819d5 Add missing HTTP status codes taken from 
http://www.iana.org/assignments/http-status-codes/http-status-codes.xml 

The new codes are now known and some canned error
strings are provided. The web server does not yet actually
produce them in responses or reacts on getting them
from an origin server when acting as a proxy or gateway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1361784 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-15 20:22:03 +00:00
Stefan Fritsch
99d37b2e33 Add new directive LuaAuthzProvider to allow implementing an 
authorization provider in lua


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1351020 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-16 22:51:19 +00:00
Stefan Fritsch
2385ef2c2f use macro to make definition of integer fields more compact 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1351019 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-16 22:47:48 +00:00
Stefan Fritsch
ca02d628a6 Change prototype of vm_construct, to work around gcc bug which 
causes a segfault.

PR: 52779
Submitted by: Dick Snippe <Dick Snippe tech omroep nl>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1351012 13f79535-47bb-0310-9956-ffa450edef68
 2012-06-16 22:38:58 +00:00
Stefan Fritsch
7b8c246611 Be more verbose when logging syntax errors 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1305586 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-26 20:59:11 +00:00
Stefan Fritsch
03a8b1b4c2 Fix some typos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1300766 13f79535-47bb-0310-9956-ffa450edef68
 2012-03-14 22:21:50 +00:00
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-02 23:02:04 +00:00
Jeff Trawick
582674a462 remove lingering reslist cruft 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203632 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-18 12:59:36 +00:00
Brian McCallister
49ac1fbeb2 remove lingering reslist references before killing server scope 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200646 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 23:57:57 +00:00
Brian McCallister
1278d68ae7 remove ability to set min and max pool sizes for server scope in prep for removing server scope 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200639 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 23:54:00 +00:00
Brian McCallister
db8040ed4f remove some debug logging which snuck in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200614 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 23:13:08 +00:00
Brian McCallister
5eb6753e25 remove last traces of the code cache 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200513 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 20:02:07 +00:00
Brian McCallister
1cedf45414 fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200475 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 18:48:50 +00:00
Eric Covener
1abbc00118 add constants for PROXYREQ_* to the apache2 global, allow r.proxyreq and 
r.handler to be writable.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195168 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-30 14:30:04 +00:00
Jim Jagielski
427c85bd23 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174751 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:39:32 +00:00
Stefan Fritsch
ae3664de2c Simplify code by using apr_array_pstrcat() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1147680 13f79535-47bb-0310-9956-ffa450edef68
 2011-07-17 16:33:03 +00:00
Stefan Fritsch
ee445c943e avoid compiler warnings with gcc 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098399 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-01 20:16:19 +00:00
Guenter Knauf
55fdc6fee7 Fixed mod_lua - 2nd trial. 
Reverted changed vm_release call from r1082026;
fixed cleanup_lua call.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082033 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-16 02:47:58 +00:00
Guenter Knauf
6dc7d31f3e Fixed indent. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082030 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-16 02:30:53 +00:00
Guenter Knauf
7fda9f81bd Fixed mod_lua. 
Added some casts to make picky compilers happy;
changed vm_release() proto and call.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082026 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-16 01:34:45 +00:00
Brian McCallister
2fed37e78a apply patch from zhiguo zhao <zhaozg@gmail.com> to significantly improve server scope handling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1081611 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-14 23:43:23 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
Daniel Earl Poirier
c9fc37b35b Log error if unable to load lua file. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@939986 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-01 12:02:53 +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
d68a529544 change r.content_type = "something" to use ap_set_content_type, which it should as was pointed out by Bertrand Mansion 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@748946 13f79535-47bb-0310-9956-ffa450edef68
 2009-03-01 01:25:27 +00:00
Paul Querna
4fbf0b5ff3 Hack to add basic support for LuaJIT. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@728779 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-22 21:15:32 +00:00