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
22,835 Commits 62 Branches 306 Tags
e06efbc2007e391834ce2a49ca10c2fd3eee714b
Commit Graph

121 Commits

Author SHA1 Message Date
Rainer Jung
7b167c68d3 Remove luaL_reg macro definition no longer needed 
and simplify lua_load compatibility macro.

Note that in order to successfully compile with
Lua 5.2.0 we still need to add LUA_COMPAT_ALL
to CPPFLAGS. Detection in config.m4 is still
missing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239030 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 09:51:59 +00:00
Rainer Jung
d0257e2db8 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..


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1239029 13f79535-47bb-0310-9956-ffa450edef68
 2012-02-01 09:50:14 +00:00
Guenter Knauf
3db3bf501c Make mod_lua compile with lua 5.2.x. 
MOdified patch submitted by NormW (nornw gknw net).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1221205 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-20 11:27:43 +00:00
Stefan Fritsch
76f782e188 Various code cleanup to avoid compiler, cppcheck, or clang warnings: 
modules/debugging/mod_firehose.c: Make some internal functions static
                                  (to do: logs_cleanup() is unused)

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/trunk@1220493 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 17:52:59 +00:00
Stefan Fritsch
b9dacea0ea remove some dead code 
found by clang statical analyzer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220462 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-18 17:25:40 +00:00
Graham Leggett
cb21a0dbcc 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/trunk@1214015 13f79535-47bb-0310-9956-ffa450edef68
 2011-12-14 01:10:52 +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
Graham Leggett
394e5594d6 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/trunk@1206291 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-25 19:42: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
Eric Covener
f2a7fff9ae add some todos from my apachecon notes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201460 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-13 17:10:03 +00:00
Eric Covener
b53e38b314 add per-dir config merging to mod_lua so LuaHook* in multiple per-dir sections 
behaves as expected instead of discarding previous sections.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201443 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-13 15:48:06 +00:00
Rainer Jung
24b66f8823 Use the right lua scope when used as a hook. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201042 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 20:22:08 +00:00
Eric Covener
727cca9fdb don't let thread-scope be selected in a server w/o threads 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200977 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 17:30:18 +00:00
Eric Covener
45b5bfb549 C99 and unused variable warnings 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200975 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 17:27:06 +00:00
Brian McCallister
bed1f11a32 use a sub-pool for scope_once 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200667 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 00:49:05 +00:00
Brian McCallister
bc7ecfdcf9 replace server scope with thread scope 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200656 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-11 00:16:56 +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
Joe Orton
48a5e0390d * 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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200580 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 21:45:27 +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
e66f481ac3 expose r:trace1-8 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200432 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 17:10:17 +00:00
Eric Covener
2fb4d8c18f ap_check_cmd_context checks don't work on the block forms 
of the lua directives.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200204 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-10 07:30:55 +00:00
Gregg Lewis Smith
1bc9c909bb since mod_ssl.h is now included, tell compiler where to find it 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200037 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-09 23:29:45 +00:00
Guenter Knauf
bfe80971d2 Fixed NetWare build. 
Patch submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200035 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-09 23:21:13 +00:00
Eric Covener
2af550c8c9 mod_lua: Expose SSL variables via r:ssl_var_lookup() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199056 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 01:53:15 +00:00
Eric Covener
d63996c35d allow some lua hooks to be run in "early" or "late" mode 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199031 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 00:36:03 +00:00
Eric Covener
eaffe604d0 correct return val, the char* is pushed on the lua stack. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199028 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 00:25:47 +00:00
Eric Covener
629d9075cb quick handlers and translate_name in lua can't be keyed off 
Directory/Filename/htaccess



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197853 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-05 01:08:05 +00:00
Eric Covener
9143f29d2d provide ap_escape_html as r:escape_html() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197838 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-05 00:16:36 +00:00
Eric Covener
bb2c7989ea get the hello world of Handlers working again 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1197782 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-04 21:17:57 +00:00
Eric Covener
214b8e88b0 make r.handler and r.proxyreq readable too 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195172 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-30 14:39:20 +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
Eric Covener
89b65554be alphabetize writable lua properties and use strcmp() for the oddball that's 
just testing quality of "user".



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1195167 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-30 14:19:45 +00:00
Eric Covener
70ebce981b make r.args read/write for rewrite refugees. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194997 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 19:42:32 +00:00
Eric Covener
562c9d7876 quick handler in an external file is already enabled, quick handler in block 
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
 2011-10-22 18:50:45 +00:00
Eric Covener
10c800bb95 expose ap_construct_url to lua scripts 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1187743 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-22 18:07:43 +00:00
Stefan Fritsch
45cbf99b00 Fix format string bugs in mod_lua. Found by gcc and pointed out by Igor Galic. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180332 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-08 07:50:06 +00:00
Stefan Fritsch
374a42b9a0 More style fixes, no func changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174937 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 18:20:43 +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
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
Jim Jagielski
103f776c25 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@1174748 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:38:09 +00:00
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