1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

78 Commits

Author SHA1 Message Date
Stefan Fritsch
e487ff2212 enable mod_lua at level 'all' if the dependencies are present
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150473 13f79535-47bb-0310-9956-ffa450edef68
2011-07-24 19:14:25 +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
Rainer Jung
a68daf2a82 Allow to specify module specific custom linker flags
via the MOD_XXX_LDADD variables.

Use APR_ADDTO instead of APR_SETVAR or direct
variable assignment.

This is especially useful when building mod_lua
or mod_deflate against a lua resp. libz which
are installed in non-standard locations.
One can add "-R ..." to MOD_LUA_LDADD and
MOD_DEFLATE_LDADD before configure to fix
the RPATH/RUNPATH of those modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142938 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 09:24:23 +00:00
Rainer Jung
9ed2afa2b9 Tolerate dependency checking failures in configure
for modules that have been enabled only implicitely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142892 13f79535-47bb-0310-9956-ffa450edef68
2011-07-05 05:31:22 +00:00
Rainer Jung
e2dd8ef18f Respect platform specific runpath linker flag
when building mod_deflate and mod_lua.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142713 13f79535-47bb-0310-9956-ffa450edef68
2011-07-04 15:19:00 +00:00
Rainer Jung
7353c3d13d Fix configure error when configuring module set "reallyall".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102328 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 14:35: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
Stefan Fritsch
7b61bedb2f Change the ap_cfg_getline() and ap_cfg_getc() to return an error code.
Also:
- Make ap_cfg_getline() return APR_ENOSPC if a config line is too long.
- Add ap_pcfg_strerror() function to convert ap_cfg_getline's return value
  into a nice message.
- Adjust definition of ap_configfile_t accordingly.

Not bumping MMN because it has already been bumped today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086756 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 21:29:34 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 03:09:27 +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
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux.
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux.
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:04:40 +00:00
William A. Rowe Jr
956c10f79c Text, please
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051318 13f79535-47bb-0310-9956-ffa450edef68
2010-12-20 23:36:12 +00:00
Stefan Fritsch
1f7417309f add support for trace loglevels in mod_lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1032084 13f79535-47bb-0310-9956-ffa450edef68
2010-11-06 14:48:43 +00:00
Stefan Fritsch
affc4cf328 save some memory by using cmd->temp_pool instead of cmd->pool in some places
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002156 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 13:19:33 +00:00
Brian McCallister
12a304c223 expose subprocess_env on lua request object
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@967143 13f79535-47bb-0310-9956-ffa450edef68
2010-07-23 15:52:37 +00:00
Guenter Knauf
5e8988e256 Removed obsolete include paths from NetWare makefiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 23:38:58 +00:00
Guenter Knauf
0cda847081 Added casts to make strict compilers happy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@965314 13f79535-47bb-0310-9956-ffa450edef68
2010-07-18 23:02:29 +00:00
Rainer Jung
c2fb104731 No need for trailing semicolon after APR_DECLARE_EXTERNAL_HOOK.
gcc complains when using -pedantic.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953351 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 15:32:33 +00:00
William A. Rowe Jr
f0d46a36f1 Mop up more than a dozen const'ness faults
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953216 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 04:42:52 +00:00
William A. Rowe Jr
7716d3c3e3 Drop ap_body_to_table due to missing constraints; a DoS waiting
for an exploit.

Some mod_lua fan aught to revisit this and provide a sensible
implementation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953203 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 03:02:07 +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
Stefan Fritsch
9d791e0e60 Fix some modules to make them compile with per-module loglevels.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951894 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:56:08 +00:00
Jeff Trawick
1477c61e6f odd assortment of spelling fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@947651 13f79535-47bb-0310-9956-ffa450edef68
2010-05-24 14:26:49 +00:00
Daniel Earl Poirier
8f18c0b43d Note that it would be nice if we could write authn and authz providers
in lua.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@941734 13f79535-47bb-0310-9956-ffa450edef68
2010-05-06 13:58:58 +00:00
Daniel Earl Poirier
1f4b662ca5 Add info to debug logging.
Avoid null pointer dereference by returning if we can't get
a lua VM.
Move "we got a VM" message to after we know we have one.
Check that we found the lua handler function before trying to
call it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@939987 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 12:04:27 +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
Daniel Earl Poirier
f07bb6b918 An uninitialized pointer in ap_lua_mapped_handler_spec was causing
seg faults in lua.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@939980 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 11:43:55 +00:00
Daniel Earl Poirier
94a86a5c96 Change references from mod_wombat to mod_lua.
Remove references to no-longer-needed pre-req, mod_apreq2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@939703 13f79535-47bb-0310-9956-ffa450edef68
2010-04-30 15:05:07 +00:00
Rainer Jung
76709be016 Use "=" instead of "==" in test condition for
improved shell compatibility.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@888546 13f79535-47bb-0310-9956-ffa450edef68
2009-12-08 19:46:10 +00:00
Brian McCallister
796d34a469 expose r->notes to lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@833141 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 19:31:27 +00:00
Joe Orton
0aa10f9c58 * modules/lua/: s/apr_strnatcmp/strcmp/ - strnat*cmp functions are
for natural order string sorting.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832910 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:39:57 +00:00
Brian McCallister
4ae86f20e4 allow setting of r->user from lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832905 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:28:22 +00:00
Brian McCallister
813ff64ace map r->err_headers_out into lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832901 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 23:22:15 +00:00
William A. Rowe Jr
0da446e9ea push_connection, push_server also targetted for export, no?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808727 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:40:44 +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
William A. Rowe Jr
5181635ab3 Always make mod_*.h files available where they exist, modpath by modpath
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68
2009-08-28 01:27:46 +00:00
Guenter Knauf
9bd30c378e skip another lua source file with NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793593 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 14:31:07 +00:00
Guenter Knauf
cda78b35b3 and another NetWare build fix for mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793449 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 03:00:59 +00:00
Guenter Knauf
3aa02d23cc final NetWare mod_lua build fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793442 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 01:44:24 +00:00
Guenter Knauf
434b5837cc added NetWare makefile for mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@793432 13f79535-47bb-0310-9956-ffa450edef68
2009-07-12 23:49:57 +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
Brian McCallister
018bda3602 remove unusable test file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@784642 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 03:10:00 +00:00
William A. Rowe Jr
6ea0ab9e0a Add . 'default' test first before searching paths, to determine if the
lua.h, liblua5.1, liblua-5.1 or liblua can be resolved.  This avoids
adding strange paths on fedora/redhat, and choosing the wrong /lib[64]
flavor.

Also ensure -lm is always added to the actual linked libraries, avoiding
a LoadModule failure on fedora/redhat.  Still should first try to search 
for pkg-config lua settings, but note this would break fedora until that
build hackery is corrected, c.f. the bug
https://bugzilla.redhat.com/show_bug.cgi?id=499238



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@772864 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 06:47:33 +00:00
William A. Rowe Jr
180e2dff26 headers are nice too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758647 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 13:54:21 +00:00