www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Code Activity
22,500 Commits 62 Branches 304 Tags
c7f1896fa72eafc46943b51a07b72634fda93ca3
Commit Graph

114 Commits

Author SHA1 Message Date
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
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