summaryrefslogtreecommitdiff
path: root/modules/lua
Commit message (Collapse)AuthorAgeFilesLines
* backport mod_lua changes(r1524321): check for big endian and don't fiddle ↵Daniel Gruno2013-09-181-0/+3
| | | | | | with bits if so. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1524328 13f79535-47bb-0310-9956-ffa450edef68
* Backport a few things in mod_lua:Daniel Gruno2013-09-172-17/+501
| | | | | | | | | - Fix filters - Add setcookie/getcookie - Add preliminary WebSocket support - Update documentation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523974 13f79535-47bb-0310-9956-ffa450edef68
* modules: Fix some compiler warnings.Graham Leggett2013-09-141-1/+1
| | | | | | | | | | | | | | trunk patch: http://svn.apache.org/r1500345 http://svn.apache.org/r1500362 http://svn.apache.org/r1500423 http://svn.apache.org/r1500483 http://svn.apache.org/r1500519 Submitted by: fuankg Reviewed by: jim, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1523259 13f79535-47bb-0310-9956-ffa450edef68
* Removed comment which should never have been committed.Guenter Knauf2013-09-011-1/+0
| | | | | | | (thanks Eric!) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1519285 13f79535-47bb-0310-9956-ffa450edef68
* Remove line added during the trunk sync inRainer Jung2013-06-281-1/+0
| | | | | | | | r1491468. The line never was part of trunk. CTR (mod_lua). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1497649 13f79535-47bb-0310-9956-ffa450edef68
* Added new r:touch() function; updated docs.Guenter Knauf2013-06-251-0/+21
| | | | | | | (Backport r1495270, r1495665, r1495666) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1496483 13f79535-47bb-0310-9956-ffa450edef68
* mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700).Guenter Knauf2013-06-113-5/+275
| | | | | | | Added missing files from commit r1491468. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1491913 13f79535-47bb-0310-9956-ffa450edef68
* mod_lua: Fully sync 2.4.x with trunk (catch up to r1490700):Graham Leggett2013-06-1015-164/+428
| | | | | | | | | 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
* mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to)Graham Leggett2013-06-077-64/+2108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* backported r1439208 to 2.4Daniel Gruno2013-02-021-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1441739 13f79535-47bb-0310-9956-ffa450edef68
* Added missing part of incomplete backport r1439099.Guenter Knauf2013-01-281-0/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439357 13f79535-47bb-0310-9956-ffa450edef68
* Backport lua dbd bindings to 2.4Daniel Gruno2013-01-276-3/+906
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1439099 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1397687 from trunk:Jim Jagielski2013-01-091-3/+6
| | | | | | | | | | configure: Fix processing of --disable-FEATURE for various features. Submitted by: trawick Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1430949 13f79535-47bb-0310-9956-ffa450edef68
* backport r1385216, r1387610 from trunk:Jim Jagielski2012-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Spin off module-specific build options into separate build vars. [second try, supersedes r1385214] Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands, which are available to modules for customization on a per-subdir basis (by adding definitions to modules.mk). Reduces the risk of side-effects when a module needs to add CFLAGS, LDFLAGS etc. and these would be added to the global settings (ALL_CFLAGS etc.). Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate, mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx build variables. Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where they appear at the proper position in the build commands. Consistently use "--with-xxx=PATH" in configure help strings which are used to specify a path to the installation directory of an auxiliary package. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1351020, r1370466 from trunk:Jim Jagielski2012-08-172-2/+150
| | | | | | | | | | | | | | | | | Add new directive LuaAuthzProvider to allow implementing an authorization provider in lua There is only one global provider name space, therefore allow LuaAuthzProvider only in global scope. Remove unnecessary server config field. Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1374252 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1361801 from trunk:Jim Jagielski2012-08-141-4/+3
| | | | | | | | | | | | | Various code clean up Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 52893 Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1373092 13f79535-47bb-0310-9956-ffa450edef68
* Big mod_lua backport:Rainer Jung2012-08-047-292/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1201460: Add some todos from apachecon notes. Submitted by: covener r1351012: 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> r1351013: Allow tail call optimization in log methods, remove foo method. Submitted by: sf r1351014: Add a few missing request_rec fields. Rename remote_ip to client_ip to match conn_rec. Submitted by: sf r1351017: Change various strings from char * to const char *. Submitted by: sf r1351018: Factor common code into utility function. Also improve logging a bit and adjust some log levels. Submitted by: sf r1351019: Use macro to make definition of integer fields more compact. Submitted by: sf Reviewed by: humbedooh, covener, sf Backported by: humbedooh, rjung git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1369494 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1366621 from trunk:Jim Jagielski2012-07-281-2/+3
| | | | | | | | | LUA_COMPAT_ALL should be defined _before_ including lua headers Submitted by: humbedooh Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1366689 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1352047, r1361298 from trunk:Jim Jagielski2012-07-252-0/+32
| | | | | | | | | | | | | Add the missing parsebody function to mod_lua, for parsing POST data. PR 53064. - Define LUA_COMPAT_ALL so mod_lua will be compatible with Lua 5.2 - Add an optional integer argument for parsebody, specifying the maximum size of POST that will be accepted. Submitted by: humbedooh Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1365539 13f79535-47bb-0310-9956-ffa450edef68
* Add missing HTTP status codes taken fromRainer Jung2012-07-201-0/+18
| | | | | | | | | | | | | | | | | 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. Backport of r1361784, r1361791 and 1362020 from trunk. Submitted by: rjung Reviewed by: jorton, trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1363802 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1305586 from trunk:Jim Jagielski2012-04-271-17/+3
| | | | | | | | | | Be more verbose when logging syntax errors Submitted by: sf Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331413 13f79535-47bb-0310-9956-ffa450edef68
* fix various property issuesAndré Malo2012-04-042-0/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1309579 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1300766:Stefan Fritsch2012-03-162-2/+2
| | | | | | | | | Fix some typos No logic change. I think this is CTR, please correct me if I am wrong. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301701 13f79535-47bb-0310-9956-ffa450edef68
* Improve Lua 5.2.0 compatibility.Rainer Jung2012-02-013-1/+7
| | | | | | | | | | | | | | | | | | | | | | | 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
* Various code cleanup to avoid compiler, cppcheck, or clang warnings:Stefan Fritsch2011-12-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modules/filters/mod_charset_lite.c: Remove dead assignments modules/filters/mod_include.c: likewise modules/metadata/mod_usertrack.c: likewise modules/proxy/mod_proxy_ftp.c: likewise modules/ssl/ssl_engine_pphrase.c: likewise modules/proxy/mod_proxy_balancer.c: likewise; Remove NULL check that can never happen modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it would, it would just mask another bug os/unix/unixd.c: likewise modules/http/http_filters.c: Remove sub-condition that is always true modules/lua/mod_lua.c: Add default cases to switch statements modules/generators/mod_autoindex.c: Unsigned value can never be < 0 server/util_expr_eval.c: Fix compiler warnings with VC and on OS2 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1220509 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1220462: Stefan Fritsch2011-12-181-6/+1
| | | | | | | | remove some dead code found by clang statical analyzer git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1220507 13f79535-47bb-0310-9956-ffa450edef68
* Backport:Graham Leggett2011-12-141-1/+1
| | | | | | | | | | Further clarify the naming of the entity that originates the request by calling that entity a useragent instead of a client. Further clarify the naming of the entity that directly connects to us by calling that entity a client instead of a peer. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214022 13f79535-47bb-0310-9956-ffa450edef68
* Backport r1209766, r1210252, r1210284:Stefan Fritsch2011-12-054-21/+21
| | | | | | | | | | Add lots of unique tags to error log messages ssl_util.c: Downgrade some dynamic locking messages from level DEBUG to TRACE1-3 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68
* Backport:Graham Leggett2011-11-301-1/+1
| | | | | | | | | | | | Introduce a per request version of the remote IP address, which can be optionally modified by a module when the effective IP of the client is not the same as the real IP of the client (such as a load balancer). Introduce a per connection "peer_ip" and a per request "client_ip" to distinguish between the raw IP address of the connection and the effective IP address of the request. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1208378 13f79535-47bb-0310-9956-ffa450edef68
* r1203632 from trunk:Jeff Trawick2011-11-181-12/+0
| | | | | | | remove lingering reslist cruft git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1203645 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1201443 from trunk:Eric Covener2011-11-133-5/+98
| | | | | | | | | | | add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections behaves as expected instead of discarding previous sections. Reviewed by: covener git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201445 13f79535-47bb-0310-9956-ffa450edef68
* Use the right lua scope when used as a hook.Rainer Jung2011-11-111-1/+26
| | | | | | | Backport of r1201042 from trunk. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1201046 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1200977 from trunk:Jim Jagielski2011-11-111-3/+12
| | | | | | | | | | | don't let thread-scope be selected in a server w/o threads Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200983 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1200975 from trunk:Jim Jagielski2011-11-111-4/+1
| | | | | | | | | | C99 and unused variable warnings Submitted by: covener Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200982 13f79535-47bb-0310-9956-ffa450edef68
* Merge r1200475, r1200478, r1200482, r1200491, r1200513, r1200550, r1200580, ↵Jim Jagielski2011-11-117-309/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | r1200605, r1200612, r1200614, r1200639, r1200646, r1200656, r1200667, r1200679, r1200699, r1200957, r1200961, r1200963 from trunk: fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working Default to not allowing htaccess in /, instead of just the documentroot, which gets a nice 10% performance boost by default for me. * modules/ssl/ssl_private.h, modules/ssl/ssl_engine_kernel.c (ssl_callback_tlsext_tickets): Use unsigned char * to fix gcc -Wpointer-sign warnings. Only load the really imporant modules (i.e. those enabled by the 'few' selection) by default. Don't handle modules enabled with --enable-foo specially. This fixes problems with module dependencies until someone implements a mechanism for resolving module dependencies. remove last traces of the code cache * modules/proxy/mod_proxy_html.c (comp_urlmap): Fix const-ness warning. * modules/lua/mod_lua.c (ap_lua_ssl_is_https): New function. (lua_post_config): Pick up ssl_is_https optional function. * modules/lua/lua_request.c (req_ssl_is_https_field): New function. (ap_lua_load_request): Map is_https field to above. remove some debug logging which snuck in remove ability to set min and max pool sizes for server scope in prep for removing server scope remove lingering reslist references before killing server scope replace server scope with thread scope use a sub-pool for scope_once Fix installation of conf/extra/proxy-html.conf. Otherwise httpd does no longer start, because it is the only extra file required in the main config at the moment. Rebuild xdoc transform Clarify docs for LimitRequestLine, as per bug #51665. Rebuild doc transforms. Submitted by: brianm, pquerna, jorton, sf, brianm, jorton, jorton, sf, pquerna, brianm, brianm, brianm, brianm, brianm, jorton, rjung, rbowen, rbowen, rbowen Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1200981 13f79535-47bb-0310-9956-ffa450edef68
* expose r:trace1-8Eric Covener2011-11-101-0/+31
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200432 13f79535-47bb-0310-9956-ffa450edef68
* ap_check_cmd_context checks don't work on the block formsEric Covener2011-11-101-11/+0
| | | | | | | | of the lua directives. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200204 13f79535-47bb-0310-9956-ffa450edef68
* since mod_ssl.h is now included, tell compiler where to find itGregg Lewis Smith2011-11-091-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200037 13f79535-47bb-0310-9956-ffa450edef68
* Fixed NetWare build.Guenter Knauf2011-11-091-0/+1
| | | | | | | Patch submitted by: normw gknw net. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200035 13f79535-47bb-0310-9956-ffa450edef68
* mod_lua: Expose SSL variables via r:ssl_var_lookup()Eric Covener2011-11-083-0/+32
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199056 13f79535-47bb-0310-9956-ffa450edef68
* allow some lua hooks to be run in "early" or "late" modeEric Covener2011-11-081-48/+181
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199031 13f79535-47bb-0310-9956-ffa450edef68
* correct return val, the char* is pushed on the lua stack.Eric Covener2011-11-081-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199028 13f79535-47bb-0310-9956-ffa450edef68
* quick handlers and translate_name in lua can't be keyed off Eric Covener2011-11-051-0/+21
| | | | | | | | Directory/Filename/htaccess git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197853 13f79535-47bb-0310-9956-ffa450edef68
* provide ap_escape_html as r:escape_html() Eric Covener2011-11-051-0/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197838 13f79535-47bb-0310-9956-ffa450edef68
* get the hello world of Handlers working againEric Covener2011-11-041-0/+3
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197782 13f79535-47bb-0310-9956-ffa450edef68
* make r.handler and r.proxyreq readable tooEric Covener2011-10-301-1/+18
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195172 13f79535-47bb-0310-9956-ffa450edef68
* add constants for PROXYREQ_* to the apache2 global, allow r.proxyreq andEric Covener2011-10-302-0/+24
| | | | | | | | r.handler to be writable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195168 13f79535-47bb-0310-9956-ffa450edef68
* alphabetize writable lua properties and use strcmp() for the oddball that'sEric Covener2011-10-301-9/+10
| | | | | | | | just testing quality of "user". git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195167 13f79535-47bb-0310-9956-ffa450edef68
* make r.args read/write for rewrite refugees.Eric Covener2011-10-291-0/+6
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194997 13f79535-47bb-0310-9956-ffa450edef68
* quick handler in an external file is already enabled, quick handler in block Eric Covener2011-10-221-1/+2
| | | | | | | | form seems to work just as well. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1187748 13f79535-47bb-0310-9956-ffa450edef68
View Lorry Controller Status