]>
granicus.if.org Git - apache/log
Jeff Trawick [Sat, 4 Aug 2012 20:32:50 +0000 (20:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1369428 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 4 Aug 2012 19:39:20 +0000 (19:39 +0000)]
r1359057 added and include to mod_ssl.h
Show the compiler where to find it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1369419 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 4 Aug 2012 12:16:58 +0000 (12:16 +0000)]
mention migration from ap_requires() and to ap_runtime_dir_relative()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1369300 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 4 Aug 2012 12:10:15 +0000 (12:10 +0000)]
fix syntax error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1369299 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 4 Aug 2012 09:15:58 +0000 (09:15 +0000)]
Add some initial example scripts and function reference for what will be a lengthy discussion of various hook/action implementations in mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1369293 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 3 Aug 2012 13:53:20 +0000 (13:53 +0000)]
Fix up the order of hooks and separate auth and access hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368959 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 18:51:48 +0000 (18:51 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368643 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 18:51:05 +0000 (18:51 +0000)]
Add some missing values
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368642 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:36:17 +0000 (13:36 +0000)]
Merged in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368469 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:23:01 +0000 (13:23 +0000)]
Also in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368461 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Aug 2012 13:20:14 +0000 (13:20 +0000)]
This is in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368459 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 11:11:43 +0000 (11:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368417 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 11:09:58 +0000 (11:09 +0000)]
Add some more information about which request phases are available for hooking, and what they do.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368416 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 09:17:34 +0000 (09:17 +0000)]
Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368396 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 09:05:49 +0000 (09:05 +0000)]
bad header info: ap_rflush does not return the number of bytes flushed, it returns 0 on success, -1 on error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368393 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 08:15:43 +0000 (08:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368378 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 2 Aug 2012 08:13:54 +0000 (08:13 +0000)]
- Add some information about the fields in the request_rec structure
- Add r.is_https to the list of fields
- Add r:escape_html to the list of function calls
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368377 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Wed, 1 Aug 2012 21:39:16 +0000 (21:39 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368269 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Wed, 1 Aug 2012 21:37:52 +0000 (21:37 +0000)]
fix formating and some links
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368265 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 20:15:37 +0000 (20:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368234 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 20:13:04 +0000 (20:13 +0000)]
Add some info about what LuaHookTypeChecker could be used for (other ideas are most welcome)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368232 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 19:21:57 +0000 (19:21 +0000)]
Fix up some contradictory contexts
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368204 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 1 Aug 2012 17:11:14 +0000 (17:11 +0000)]
spelling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368131 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 1 Aug 2012 16:54:00 +0000 (16:54 +0000)]
core: Add post_perdir_config hook.
Submitted by: Steinar Gunderson <sgunderson bigfoot.com>
trawick added/fixed include/ pieces
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368121 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 1 Aug 2012 16:41:04 +0000 (16:41 +0000)]
mod_lua.c:189:13: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368109 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 16:19:31 +0000 (16:19 +0000)]
xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368095 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 16:18:51 +0000 (16:18 +0000)]
Remove anchor with dublicate id.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368094 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 15:34:43 +0000 (15:34 +0000)]
Complete docs metadata (sourcefile and identifier)
for mod_unixd and mod_privileges.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368058 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Aug 2012 15:25:02 +0000 (15:25 +0000)]
Add a docs link to a configuration example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1368053 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:25:15 +0000 (12:25 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367955 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 12:23:04 +0000 (12:23 +0000)]
Change the external reference to mod_proxy_html to an internal one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367951 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 1 Aug 2012 07:28:22 +0000 (07:28 +0000)]
mod_lua:
Clean up style
use apr_pstrcat instead of apr_psprintf
fix a bug that was causing bad string interpolations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367875 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 31 Jul 2012 23:19:56 +0000 (23:19 +0000)]
initialize the protocol field when manufacturing an apr socket
lest accidential autodata contents leak into the apr_socket_t
(this doesn't address any known problem symptom)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367819 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jul 2012 20:59:29 +0000 (20:59 +0000)]
Fix typo in docs
(miscomception ->misconception)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367778 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 19:59:30 +0000 (19:59 +0000)]
Update CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367735 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 19:43:29 +0000 (19:43 +0000)]
mod_lua: Add the (missing) LuaMapHandler directive to the fold.
This should work as the existing documentation describes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367725 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 15:00:19 +0000 (15:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367594 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 14:56:59 +0000 (14:56 +0000)]
Remove [max|min max] from the LuaScope syntax, since the 'server' scope is not implemented yet.
Note that 'thread' only applies to threaded MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367590 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 12:03:29 +0000 (12:03 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367512 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 12:01:45 +0000 (12:01 +0000)]
fix some xml errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367511 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 11:52:42 +0000 (11:52 +0000)]
Add some examples for LuaHookMapToStorage and LuaAuthzProvider
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367506 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 31 Jul 2012 11:47:04 +0000 (11:47 +0000)]
mod_lua: The current way of getting the authz provider name doesn't seem to work. This approach should fix that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367504 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 31 Jul 2012 01:02:14 +0000 (01:02 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367382 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Tue, 31 Jul 2012 01:00:05 +0000 (01:00 +0000)]
bump versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367381 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 21:12:41 +0000 (21:12 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367305 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 21:09:41 +0000 (21:09 +0000)]
Missing an 'a' in the new warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367300 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 13:36:16 +0000 (13:36 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367085 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 13:33:57 +0000 (13:33 +0000)]
b -> strong
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367082 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 13:31:28 +0000 (13:31 +0000)]
Add a security notice about using mod_lua on shared hosting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367081 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 09:36:44 +0000 (09:36 +0000)]
mod_lua: Remember to set cfg->codecache to AP_LUA_CACHE_UNSET when creating a config
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367048 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 09:12:52 +0000 (09:12 +0000)]
Forgot to sign it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367043 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 09:11:40 +0000 (09:11 +0000)]
Add LuaCodeCache to CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367042 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 09:06:41 +0000 (09:06 +0000)]
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
Igor Galić [Mon, 30 Jul 2012 08:43:23 +0000 (08:43 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367034 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Mon, 30 Jul 2012 08:39:42 +0000 (08:39 +0000)]
Selecting an MPM in performance docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1367031 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 30 Jul 2012 08:19:14 +0000 (08:19 +0000)]
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
Daniel Gruno [Sun, 29 Jul 2012 19:08:18 +0000 (19:08 +0000)]
uncomment LuaCodeCache directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366891 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 19:07:38 +0000 (19:07 +0000)]
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
Daniel Gruno [Sun, 29 Jul 2012 16:00:54 +0000 (16:00 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366864 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 15:58:47 +0000 (15:58 +0000)]
LuaQuickHandler had no syntax, which made the reference sheet look wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366862 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 15:53:38 +0000 (15:53 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366861 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 15:49:52 +0000 (15:49 +0000)]
Comment out LuaCodeCache, which hasn't been implemented yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366859 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 28 Jul 2012 12:00:14 +0000 (12:00 +0000)]
Add a note about LUA_COMPAT_ALL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366655 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 28 Jul 2012 09:09:07 +0000 (09:09 +0000)]
LUA_COMPAT_ALL should be defined _before_ including lua headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366621 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Jul 2012 11:50:25 +0000 (11:50 +0000)]
mod_proxy_balancer: Restore balancing after a failed worker has
recovered when using lbmethod_bybusyness.
PR: 48735
Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735. Compared with those two, this solution
1. resets the busy field in the error-ed worker at the end of
the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
error-ed worker needs to be adjusted, since a cleanup to
perform the decrement is registered at the point of the
increment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366344 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 27 Jul 2012 09:57:09 +0000 (09:57 +0000)]
ap_str(case)cmp_match returns the opposite of what is advertized in the header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1366319 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 26 Jul 2012 11:36:29 +0000 (11:36 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365954 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 26 Jul 2012 11:32:32 +0000 (11:32 +0000)]
LuaScope also has a 'thread' value.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365950 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:29:50 +0000 (21:29 +0000)]
Remove backported item from CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365778 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 15:21:35 +0000 (15:21 +0000)]
Remove backported fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365623 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:56:20 +0000 (11:56 +0000)]
These be in 2.4.x now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365543 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 07:28:26 +0000 (07:28 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix
to skip balancer:// prefix where applicable.
Reviewed by: rjung, rpluem
PR: 45434 (regressed since 2.2)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365479 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:17:33 +0000 (21:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365293 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:12:39 +0000 (21:12 +0000)]
Remove reference to the 'server' value in LuaScope, since it doesn't exist.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365288 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 13:48:04 +0000 (13:48 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365054 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 13:47:54 +0000 (13:47 +0000)]
* docs/: Clarify ProxyBlock docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365053 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 13:01:13 +0000 (13:01 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Add error
handling for apr_sockaddr_ip_getbuf(), minor code style tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365029 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 12:54:38 +0000 (12:54 +0000)]
* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Fix memory
leak/thread-unsafe use of pconf.
Submitted by: rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365020 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Jul 2012 12:20:13 +0000 (12:20 +0000)]
sync with 2.4.x/CHANGES (r1365003)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365004 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 12:17:00 +0000 (12:17 +0000)]
Fix handling of ProxyBlock if a forward proxy is configured, and fix
mod_proxy_connect to avoid an inappropriate DNS lookup:
* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Take hostname
argument, make address argument optional. Check names against
hostname arg, omit if addr not given.
(ap_proxy_determine_connection): Adjust for the above; pass hostname
from URI not the next hop.
* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Adjust for
ap_proxy_checkproxyblock change.
* modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Adjust
similarly, and avoid the DNS lookup on the request-URI hostname if a
proxy is used.
* include/ap_mmn.h: Bump MMN.
PR: 43697
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1365001 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Jul 2012 16:01:43 +0000 (16:01 +0000)]
mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364695 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Jul 2012 13:08:37 +0000 (13:08 +0000)]
sync with 2.4.x/CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364619 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Jul 2012 12:15:39 +0000 (12:15 +0000)]
Follow up to r1363557:
Refactor with some existing code to slightly optimize thread tracking.
Fix an implementation problem affecting statically linked MPMs which
would break the ability to fail restart if a resource shortage was
found immediately.
Found by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364601 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 16:05:59 +0000 (16:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364344 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 16:01:01 +0000 (16:01 +0000)]
typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364341 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 15:50:01 +0000 (15:50 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364335 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:44:35 +0000 (14:44 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364314 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:42:12 +0000 (14:42 +0000)]
fix a whitespace issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364312 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 22 Jul 2012 14:37:03 +0000 (14:37 +0000)]
copy the context restrictions from sections.html for symlink
related options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364309 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:15:04 +0000 (14:15 +0000)]
typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364306 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 12:06:21 +0000 (12:06 +0000)]
Remove backported items from trunk CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364273 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:26:35 +0000 (11:26 +0000)]
Remove items from trunk CHANGES that have been ported back to 2.4.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364262 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jul 2012 08:31:52 +0000 (08:31 +0000)]
Correctly log the error returned by apr_dbd_pvselect()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364229 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jul 2012 18:17:10 +0000 (18:17 +0000)]
Tweak a message added in r750567 so that the accept thread
logs the physical address it listens on instead of hostname|*.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364138 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 21 Jul 2012 17:39:38 +0000 (17:39 +0000)]
When -B is specified, search for a host address in the
same family as the specified outbound interface. If
impossible, fail at name resolution instead of bind().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1364133 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 20 Jul 2012 15:51:03 +0000 (15:51 +0000)]
RPM packaging: add the fcgistarter man pages to the RPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1363853 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 20 Jul 2012 15:25:14 +0000 (15:25 +0000)]
RPM packaging: remove the epoch to be consistent with APR and APR-util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1363837 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 20 Jul 2012 15:23:46 +0000 (15:23 +0000)]
RPM packaging: The PID file goes in /var/run in the RPM layout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1363836 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 20 Jul 2012 15:17:26 +0000 (15:17 +0000)]
RPM packaging: Remove the BuildArch from the manual package, this forces
the target to "noarch" for all packages and breaks the build on CentOS5.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1363832 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 20 Jul 2012 15:15:41 +0000 (15:15 +0000)]
RPM packaging: The PID file goes in /var/run in the RPM layout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1363829 13f79535 -47bb-0310-9956-
ffa450edef68