]>
granicus.if.org Git - apache/log
Rainer Jung [Sun, 29 Jul 2012 20:09:27 +0000 (20:09 +0000)]
Add mergeinfo for r1365604 (
1365479 )
and r1366693 (
1365001 ,
1365020 ,
1365029 ).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366933 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 29 Jul 2012 18:00:23 +0000 (18:00 +0000)]
Add some backport proposals. Most of them pretty
small and easy to review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366882 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 16:05:47 +0000 (16:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366866 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 16:00:22 +0000 (16:00 +0000)]
LuaQuickHandler had no syntax, which made the reference sheet look wrong.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366863 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 29 Jul 2012 15:50:52 +0000 (15:50 +0000)]
Comment out LuaCodeCache, which hasn't been implemented yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366860 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:40:23 +0000 (14:40 +0000)]
* mod_proxy*: ProxyBlock fixes; PR 43697 and more.
trunk patch: http://svn.apache.org/viewvc?rev=
1365001 &view=rev and
http://svn.apache.org/viewvc?rev=
1365020 &view=rev and
http://svn.apache.org/viewvc?rev=
1365029 &view=rev
2.4.x patch: http://people.apache.org/~jorton/ap_proxyblock-24x-v2.diff [avoids major MMN bump]
+1: jorton, rjung, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366693 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:39:18 +0000 (14:39 +0000)]
Merge r1366344 from trunk:
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
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366691 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:37:54 +0000 (14:37 +0000)]
Merge r1366621 from trunk:
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
Jim Jagielski [Sat, 28 Jul 2012 14:37:19 +0000 (14:37 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366688 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 28 Jul 2012 14:36:56 +0000 (14:36 +0000)]
Votes on proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366687 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 28 Jul 2012 13:35:54 +0000 (13:35 +0000)]
quick votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366668 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 28 Jul 2012 12:01:39 +0000 (12:01 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366658 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Jul 2012 12:13:48 +0000 (12:13 +0000)]
this is one way to get eyes on a patch...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1366358 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:29:15 +0000 (21:29 +0000)]
mod_setenvif: Compile the regex used by is_header_regex() only once
during startup This should save some memory, especially with .htaccess
Backport of r1343099.
Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365774 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:17:16 +0000 (21:17 +0000)]
Add the port number to the vhost's name in scoreboard.
Backport of r1294358 from trunk.
Submitted by: sf
Reviewed by: rjung, jim
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365753 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 21:15:27 +0000 (21:15 +0000)]
Remove historic comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365752 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 25 Jul 2012 19:40:12 +0000 (19:40 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365702 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 25 Jul 2012 19:26:55 +0000 (19:26 +0000)]
Vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365700 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:37:42 +0000 (14:37 +0000)]
r1365479 done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365605 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:37:16 +0000 (14:37 +0000)]
Merge r1365479 from trunk:
* modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix
to skip balancer:// prefix where applicable.
Reviewed by: jorton, jim, rjung
PR: 45434 (regressed since 2.2)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365604 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 14:35:32 +0000 (14:35 +0000)]
Fixes for proxyblock patch - thanks to rjung.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365603 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Jul 2012 14:09:17 +0000 (14:09 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365594 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:50:06 +0000 (11:50 +0000)]
Merge r1352047, r1361298 from trunk:
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
Jim Jagielski [Wed, 25 Jul 2012 11:42:40 +0000 (11:42 +0000)]
* apxs: Make apxs use LDFLAGS from config_vars.mk in addition to
CFLAGS and CPPFLAGS.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1343094
2.4.x patch: trunk patch works
+1: rjung, humbedooh, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365532 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:39:52 +0000 (11:39 +0000)]
* .gdbinit: improve dump_allocator, add dump_one_pool.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1352909
2.4.x patch: trunk patch works
+1: rjung, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365529 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:38:19 +0000 (11:38 +0000)]
* htpasswd: Note more prominently that SHA and crypt are insecure.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1352910
2.4.x patch: trunk patch works
+1: rjung, humbedooh, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365528 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:36:15 +0000 (11:36 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365526 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 25 Jul 2012 11:35:35 +0000 (11:35 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365524 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Jul 2012 07:33:24 +0000 (07:33 +0000)]
Propose r1365479.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365481 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:15:52 +0000 (21:15 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365291 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 24 Jul 2012 21:13:08 +0000 (21:13 +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/branches/2.4.x@
1365289 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 24 Jul 2012 16:59:53 +0000 (16:59 +0000)]
Adding .fr translation for mod_proxy_html documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365169 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Tue, 24 Jul 2012 16:39:24 +0000 (16:39 +0000)]
Adding french translation for mod_proxy_fcgi documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365163 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 24 Jul 2012 14:05:35 +0000 (14:05 +0000)]
Nominate ProxyBlock fixes.#
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365066 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Jul 2012 12:19:08 +0000 (12:19 +0000)]
mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.
Submitted by: trawick
Reviewed by: jorton, rjung, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1365003 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 22:00:46 +0000 (22:00 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364818 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 21:59:56 +0000 (21:59 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364817 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 17:06:05 +0000 (17:06 +0000)]
Encourage best practice in Perl scripts (use strict, warnings).
Backport of r1335882 and r1325724 from trunk.
Submitted by: rbowen
Reviewed by: rjung, humbedooh
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364713 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:59:21 +0000 (16:59 +0000)]
Rich Bowen [Mon, 23 Jul 2012 16:44:30 +0000 (16:44 +0000)]
Vote for backport of Perl script enhancements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364710 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:43:56 +0000 (16:43 +0000)]
Honor DefaultRuntimeDir for mutexes, socache and CGID socket.
Move away from DEFAULT_REL_RUNTIMEDIR and use
ap_runtime_dir_relative() API.
Backport of r1299718 from trunk.
Submitted by: jim
Reviwed by: rjung, trawick
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364709 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Jul 2012 16:33:56 +0000 (16:33 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364700 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:35:53 +0000 (15:35 +0000)]
Backports*2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364685 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:34:59 +0000 (15:34 +0000)]
Merge r1327689 from trunk:
For a local variable in a macro, use a name that is less likely to clash
with other variable names.
Submitted by: sf
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364682 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:34:05 +0000 (15:34 +0000)]
Merge r1361803 from trunk:
Code clean up (remove useless memory allocation)
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 52648
Reviewed by: rjung, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364681 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:33:01 +0000 (15:33 +0000)]
More votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364680 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:22:34 +0000 (15:22 +0000)]
Backports*3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364678 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:21:52 +0000 (15:21 +0000)]
Merge r1352534 from trunk:
* modules/cache/cache_util.c (write_write_order): Remove redundant
double assignment, caught by Coverity. No functional change.
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364677 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:20:48 +0000 (15:20 +0000)]
Merge r1341906, r1341913 from trunk:
* acinclude.m4: Use AC_MSG_NOTICE.
* configure.in: Use AC_MSG_NOTICE so passing --silent works as advertised.
Reviewed by: rjung, humbedooh, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364675 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:19:37 +0000 (15:19 +0000)]
Merge r1351737 from trunk:
* support/ab.c (test, start_connect): Only bind the local end of the
socket (and look up an address for it) if -B is specified.
Reviewed by: trawick, rjung, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364674 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jul 2012 15:17:04 +0000 (15:17 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364673 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Jul 2012 13:03:21 +0000 (13:03 +0000)]
vote/promote support for DefaultRuntimeDir for a handful of modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364617 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:35:23 +0000 (12:35 +0000)]
Merge r1294356 from trunk:
Take care not to call ap_start_lingering_close from the listener thread,
because it may block when flushing data to the client.
From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.
PR: 52229
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364613 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:30:19 +0000 (12:30 +0000)]
Merge r1294349 from trunk:
Prevent listener thread from ever updating a worker's scoreboard slot
The worker may be doing something else by now. This should take
care of slots staying in "L" state in the scoreboard
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364611 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:25:16 +0000 (12:25 +0000)]
Merge r1363440 from trunk:
mpm_event, mpm_worker: Fix cases where the spawn rate wasn't reduced
after child process resource shortages.
The broken scenario:
child X exits with APEXIT_CHILDSICK
another child Y is created and reuses child X's scoreboard slot
child X's exit status is processed
The case that worked is when child X's scoreboard slot hadn't
been reused by the time that its exit status was processed.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364609 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:24:41 +0000 (12:24 +0000)]
Merge r1363035 from trunk:
avoid decls for some Unix-specific functions on Win32 too
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364608 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:24:08 +0000 (12:24 +0000)]
Merge r1363183 from trunk:
fix child exit status in prefork after certain errors in
the child so that the parent resets the spawn rate to the
minimum
or:
mpm_prefork: Reduce spawn rate after a child process exits due to
unexpected poll or accept failure.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364607 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:23:25 +0000 (12:23 +0000)]
Merge r1357685 from trunk:
* modules/filters/mod_ext_filter.c (ef_unified_filter): Set hit_eos
flag on hitting EOS.
(ef_input_filter): Give back EOS if filter is invoked after hitting
EOS, rather than attempting (and failing) to read from the closed
pipe to the child.
Submitted by: jorton
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364606 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 23 Jul 2012 12:20:03 +0000 (12:20 +0000)]
update r136355 backport request with follow-on fixes pointed out
by rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364605 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:17:18 +0000 (12:17 +0000)]
Merge r1332378 from trunk:
If a filename without slashes is specified for LoadFile or
LoadModule and the file cannot be found in the server root directory,
try to use the standard dlopen() search path.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364603 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:16:10 +0000 (12:16 +0000)]
Merge r1345329 from trunk:
remove obsolete comment (PROXY_MAGIC_TYPE is not used anywhere anymore)
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364602 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:15:33 +0000 (12:15 +0000)]
Merge r1306426, r1306841 from trunk:
Update worker mpm defaults to match documentation and built-in defaults.
As per https://issues.apache.org/bugzilla/show_bug.cgi?id=52102
Updated event mpm configuration to match the defaults in documentation and header definitions.
Updated prefork defaults to better match documentation and header definition.
Submitted by: humbedooh
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364600 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:14:34 +0000 (12:14 +0000)]
Merge r1306350 from trunk:
Adapt Timeout to be the same as DEFAULT_TIMEOUT.
After all it's localted in a file called extra/httpd-default.conf
Submitted by: igalic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364599 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:14:00 +0000 (12:14 +0000)]
Merge r1361792 from trunk:
Remove some checking for out-of-mem conditions that cannot be hit
because apr_pcalloc/apr_pool_create will call abort() anyway.
Submitted by: sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364598 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:13:17 +0000 (12:13 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364597 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jul 2012 12:11:44 +0000 (12:11 +0000)]
Votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364596 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 18:28:50 +0000 (18:28 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364393 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 16:07:16 +0000 (16:07 +0000)]
Add mergeinfo for committs backported in revisions:
r1309579, r1331413, r1203645, r1201445,
r1200983, r1200982.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364345 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 16:03:54 +0000 (16:03 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364343 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 16:01:21 +0000 (16:01 +0000)]
typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364342 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 15:50:17 +0000 (15:50 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364336 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 15:36:05 +0000 (15:36 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364332 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 15:32:22 +0000 (15:32 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364330 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 15:24:59 +0000 (15:24 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364326 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 15:11:34 +0000 (15:11 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364321 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:54:30 +0000 (14:54 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364317 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 22 Jul 2012 14:47:19 +0000 (14:47 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364315 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 22 Jul 2012 14:40:02 +0000 (14:40 +0000)]
Merge r1364309 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
copy the context restrictions from sections.html for symlink
related options
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364311 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:39:02 +0000 (14:39 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364310 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 14:31:16 +0000 (14:31 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364308 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 22 Jul 2012 14:17:01 +0000 (14:17 +0000)]
typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364307 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 14:08:59 +0000 (14:08 +0000)]
Add mergeinfo for backport done in r1242097.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364305 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 14:05:00 +0000 (14:05 +0000)]
Add mergeinfo for backports done in revisions:
r1203495, r1211353, r1213395, r1213400, r1222931,
r1308862, r1294602
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364304 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 13:51:15 +0000 (13:51 +0000)]
Fix typo in mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364303 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 13:48:30 +0000 (13:48 +0000)]
Add mergeinfo for backports done by jim in r1200981.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364302 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 13:00:52 +0000 (13:00 +0000)]
Add long list of backport proposals.
Those are all very easy to review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364285 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 12:01:17 +0000 (12:01 +0000)]
Remove backported item from STATUS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364272 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 12:00:22 +0000 (12:00 +0000)]
Log the value of Status header lines in script responses rather than
than just the fixed header name of "Status".
Backport of r1362538 from trunk.
Submitted by: chrisd
Reviewed by: rpluem, rjung
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364271 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:57:25 +0000 (11:57 +0000)]
modules/ssl/ssl_util_ocsp.c (get_line): Don't set line[-1] to 0
when len == 0.
Backport of r1358061 from trunk.
Submitted by: Jim Meyering <meyering redhat.com>
Reviewed by: jorton, trawick, rjung
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364270 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:52:29 +0000 (11:52 +0000)]
Remove applied item from STSTUS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364269 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:51:58 +0000 (11:51 +0000)]
Fix MaxConnectionsPerChild
This was broken when the handling of lingering close was moved into the
listener thread.
- Make the connection counting thread safe.
- Do the counting in the connection pool cleanup to ensure that it gets
also executed if the listener thread closes the connection.
- Add a trace log message when a process is recycled.
- Rename requests_this_child to conns_this_child, which is more accurate
Backport of r1343085 and r1343087.
Submitted by: sf
Reviewed by: humbedooh, rjung
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364268 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:44:23 +0000 (11:44 +0000)]
If an expression in "Require expr" returns denied and
references %{REMOTE_USER}, trigger authentication and retry.
Log error if 'Require expr' fails.
PR: 52892
Backport of r1351071, r1351072 and r1351074 from trunk.
Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364266 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:33:39 +0000 (11:33 +0000)]
Fix typo in CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364264 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:32:47 +0000 (11:32 +0000)]
Always log if LimitRequestFieldSize triggers.
Backport of r1352911 from trunk.
Submitted by: sf
Reviewed by: rjung, trawick
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364263 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 11:12:17 +0000 (11:12 +0000)]
Fix mod_deflate NetWare build.
Backport of r1363589 from trunk.
Submitted by: normw gknw net.
Reviewed by: fuankg
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364260 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 22 Jul 2012 10:46:21 +0000 (10:46 +0000)]
Make mod_deflate skip compression if compression is enabled at SSL level.
Backport of r1359057 from trunk.
Submitted by: sf
Reviewed by: jorton, rjung
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364253 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Jul 2012 13:36:04 +0000 (13:36 +0000)]
Backport
1363853 :
RPM packaging: add the fcgistarter man pages to the RPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364089 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Jul 2012 13:34:57 +0000 (13:34 +0000)]
Backport
1363837 :
RPM packaging: remove the epoch to be consistent with APR and APR-util.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364088 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Jul 2012 13:33:46 +0000 (13:33 +0000)]
Backport
1363836 :
RPM packaging: The PID file goes in /var/run in the RPM layout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1364087 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Jul 2012 13:32:33 +0000 (13:32 +0000)]
Backport
1363832 :
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/branches/2.4.x@
1364086 13f79535 -47bb-0310-9956-
ffa450edef68