]>
granicus.if.org Git - apache/log
Lucien Gentis [Sun, 7 Dec 2014 15:55:19 +0000 (15:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643687 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Dec 2014 15:54:05 +0000 (15:54 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643686 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 7 Dec 2014 12:54:52 +0000 (12:54 +0000)]
dump fcgi headers with trace8 instead of debug+compile-time flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643672 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 6 Dec 2014 15:36:19 +0000 (15:36 +0000)]
mod_proxy_ajp: follow up to r1643537.
Log aborted client connections with level DEBUG only (no more noise than other proxy modules).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643543 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 6 Dec 2014 15:04:27 +0000 (15:04 +0000)]
minor commentary and indentation fixes for ap_log_*data()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643538 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 6 Dec 2014 14:33:52 +0000 (14:33 +0000)]
* mod_proxy_ajp: Fix client connection errors handling and logged status
when it occurs. PR 56823.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643537 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:14:39 +0000 (14:14 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643533 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Dec 2014 14:13:44 +0000 (14:13 +0000)]
Move some tweaked/re-tested recipes from https://wiki.apache.org/httpd/RewriteQueryString into the
extended doc for mod_rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643531 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:32:05 +0000 (22:32 +0000)]
set svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643462 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:21:48 +0000 (22:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643456 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 5 Dec 2014 22:04:40 +0000 (22:04 +0000)]
validate xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643442 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Dec 2014 21:06:31 +0000 (21:06 +0000)]
Synch trunk with 2.4.x.
In r1588495, additionnal logging has been added to 2.4.x as part of the merge.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643434 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 5 Dec 2014 20:23:56 +0000 (20:23 +0000)]
Fix typo + correctly spell this poor Barbara name, otherwise she will never be able to get access
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643416 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 14:00:37 +0000 (14:00 +0000)]
mpm_event(opt): zero is immutable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643284 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 13:54:30 +0000 (13:54 +0000)]
mpm_worker: replace apr_atomic_cas32(+1) loop with the more performant
apr_atomic_inc32().
Also declare fd_queue_info_t's idlers member as volatile since it is
used outside atomic functions (or it could be optimized out by the
compiler).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643282 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 13:41:38 +0000 (13:41 +0000)]
mpm_event(opt): avoid casts/comparisons from unsigned to signed (atomics).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643279 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Dec 2014 13:41:05 +0000 (13:41 +0000)]
add some hints about using expressions in mod_headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643277 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 13:33:10 +0000 (13:33 +0000)]
now it's actually fixed (The URL)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643272 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 13:32:00 +0000 (13:32 +0000)]
fixed it!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643271 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 13:29:37 +0000 (13:29 +0000)]
another blank commit...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643269 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Dec 2014 13:28:08 +0000 (13:28 +0000)]
function examples, other flavor of function examples. replace() example
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643267 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 13:08:16 +0000 (13:08 +0000)]
another blank change, ignore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643265 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 13:02:10 +0000 (13:02 +0000)]
more blank changes to set up viewvc, ignore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643263 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 12:49:23 +0000 (12:49 +0000)]
blank change to test commit mail URL is properly working.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643258 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 5 Dec 2014 10:02:57 +0000 (10:02 +0000)]
* Correctly indent
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643220 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 5 Dec 2014 07:57:57 +0000 (07:57 +0000)]
mpm_{prefork,worker}: follow up to r1635521.
Don't crash when there is no accept mutex (one listener => apr_proc_mutex_name(NULL)).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643179 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 01:28:25 +0000 (01:28 +0000)]
testing eu <-> us sync
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643147 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 01:06:05 +0000 (01:06 +0000)]
more noise again
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643146 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 00:46:33 +0000 (00:46 +0000)]
ap_expr: Add filemod function for checking file modification times.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643145 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 00:40:04 +0000 (00:40 +0000)]
more tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643142 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Dec 2014 00:22:44 +0000 (00:22 +0000)]
bit more noise... (still testing)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643141 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 4 Dec 2014 23:58:51 +0000 (23:58 +0000)]
more tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643137 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 4 Dec 2014 23:51:16 +0000 (23:51 +0000)]
trying eu svn...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643130 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 4 Dec 2014 23:48:28 +0000 (23:48 +0000)]
More dead birds in the sky...is it summer already?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643129 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 4 Dec 2014 20:29:16 +0000 (20:29 +0000)]
Is it a bird? Is it a plane? Is it a giant flying pony??!
No, it's simply mod_lua >_>
(also, ignore this, we're just testing whether commits work)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643127 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Dec 2014 13:46:16 +0000 (13:46 +0000)]
add a warning to resp() similar to the one present for REQUEST_STATUS [too early in <if>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643118 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 3 Dec 2014 11:10:50 +0000 (11:10 +0000)]
* ap_expr: Fix replace() func when length of "from" != length of "to".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643094 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Dec 2014 01:30:39 +0000 (01:30 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643035 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Dec 2014 01:29:49 +0000 (01:29 +0000)]
elaborate on per-directory limitations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1643034 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 2 Dec 2014 13:41:14 +0000 (13:41 +0000)]
mpm_event: follow up to r1639614 (trunk) and r1642858 (2.4.x).
Notify suspend in any case when starting lingering close (blocking),
and outside the lingering queue's critical section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642868 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Dec 2014 12:25:43 +0000 (12:25 +0000)]
make docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642849 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Dec 2014 12:20:21 +0000 (12:20 +0000)]
core: Add CGIPassAuth directive to control whether HTTP authorization
headers are passed to scripts as CGI variables.
PR: 56855
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642847 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 2 Dec 2014 07:17:12 +0000 (07:17 +0000)]
Fix curly braces style
Remove useless empty lines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642803 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:22:18 +0000 (18:22 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642591 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:22:10 +0000 (18:22 +0000)]
use an actual list since we're gong to the trouble to use -in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642590 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:16:38 +0000 (18:16 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642585 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:16:27 +0000 (18:16 +0000)]
add a few more examples per feedback
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642584 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 18:13:24 +0000 (18:13 +0000)]
even out some whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642581 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 01:44:53 +0000 (01:44 +0000)]
backported in r1641551
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642501 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 30 Nov 2014 01:41:26 +0000 (01:41 +0000)]
*) SECURITY: CVE-2014-8109 (cve.mitre.org)
mod_lua: Fix handling of the Require line when a LuaAuthzProvider is
used in multiple Require directives with different arguments.
PR57204 [Edward Lu <Chaosed0 gmail.com>]
Submitted By: Edward Lu
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642499 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 29 Nov 2014 23:16:56 +0000 (23:16 +0000)]
Remove some instances where a RewriteBase must be specified
Previously, any time you used a relative substitution in
per-directory/htaccess context, you needed to specify
a RewriteBase. But in case where the context document root
and context prefix are known via e.g. mod_userdir
or mod_alias, and the substitution is under the context
document root, we can determine the replacement automatically.
This makes htaccess files or config snippets a bit more
portable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642484 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:39:20 +0000 (17:39 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642451 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Nov 2014 17:38:03 +0000 (17:38 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642450 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 27 Nov 2014 13:46:11 +0000 (13:46 +0000)]
* ap_exr: Add replace(string, from, to) function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642154 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 27 Nov 2014 11:30:54 +0000 (11:30 +0000)]
Added include path for NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1642099 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 19:05:25 +0000 (19:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641889 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Nov 2014 19:05:12 +0000 (19:05 +0000)]
add a few more expresion examples to illustrate functions and -f
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641888 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 25 Nov 2014 18:04:00 +0000 (18:04 +0000)]
mod_lua: Initial attempt at passing on the configuration tree to Lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641661 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 25 Nov 2014 15:38:10 +0000 (15:38 +0000)]
elaborate on a TRACE2 message about using the default reverse
proxy worker.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641636 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 18:04:13 +0000 (18:04 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641435 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 18:03:49 +0000 (18:03 +0000)]
move text outside of example for readability.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641434 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 16:17:21 +0000 (16:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641415 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 16:17:09 +0000 (16:17 +0000)]
steal the sethandler example from mod_proxy.html and mention worker issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641414 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:49:27 +0000 (12:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641385 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:49:03 +0000 (12:49 +0000)]
the next sentence says:
The URL argument must be parsable as a URL before regexp substitutions (as well as after). This limits the matches you can use. For instance, if we had used
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641384 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:45:34 +0000 (12:45 +0000)]
test/document php-fpm with proxy_fcgi
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641382 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 12:36:32 +0000 (12:36 +0000)]
Return a match whenever we get to the end of the worker name, regardless
of whether there is URL left.
ProxyPassMatch had been using the default worker in trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641381 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 24 Nov 2014 11:42:16 +0000 (11:42 +0000)]
mod_reqtimeout: don't extend the timeout in speculative mode, wait for the
real (relevant) bytes to be asked later, within the currently alloted time.
This applies to blocking reads only since r1621453 already bypassed the
filter for nonblocking ones.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641376 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Nov 2014 03:18:39 +0000 (03:18 +0000)]
surprising but confirmed by comment in mod_proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641311 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 22 Nov 2014 17:54:08 +0000 (17:54 +0000)]
follow up to r1641077:
one bug was traded for another in r1641077; track the response
length and the cached object length separately to avoid such
confusion
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641095 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 22 Nov 2014 14:51:01 +0000 (14:51 +0000)]
mod_ssl: Fix recognition of OCSP stapling responses that are encoded
improperly or too large.
The one byte "ok" flag stored with the response was accounted for in
the wrong condition.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1641077 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 20 Nov 2014 21:38:53 +0000 (21:38 +0000)]
mod_reqtimeout: revert r1640758.
Unexpected functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640823 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 20 Nov 2014 16:26:04 +0000 (16:26 +0000)]
mpm_event(opt), mpm_worker, mpm_prefork: follow up to r1635521, r1640161.
Retain num_buckets and max_buckets accross restarts so that we can determine
whether new buckets were allocated and set their idle_spawn_rate at the same
level as the existing ones (max).
Also, adjust ap_daemons_limit and ap_daemons_to_start lower bounds at mpm_run()
time, once num_buckets is available for the current generation (previously done
at check_config time, hence before num_buckets is computed, and then with the
previous generation's value).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640763 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 20 Nov 2014 15:39:32 +0000 (15:39 +0000)]
mod_reqtimeout: avoid unnecessary calls to apr_socket_timeout_set().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640758 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 19 Nov 2014 07:19:13 +0000 (07:19 +0000)]
* mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640495 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 18 Nov 2014 13:53:24 +0000 (13:53 +0000)]
mod_authnz_fcgi: we don't need to add the trailing '\0' to parse response headers since r1640036.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640345 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 18 Nov 2014 13:13:58 +0000 (13:13 +0000)]
mod_authnz_fcgi is not vulnerable to the CVE-2014-3583 bug
(and it is too late to use the same CVE anyway).
The code changes to mod_authnz_fcgi are retained in order
to keep the similar code in sync between the two modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640331 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Nov 2014 10:13:26 +0000 (10:13 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640296 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Nov 2014 10:12:02 +0000 (10:12 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640295 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Nov 2014 16:31:06 +0000 (16:31 +0000)]
mpm_prefork: follow up to r1635521.
Avoid oddity on bucket_make_child_record overflow.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640184 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Nov 2014 13:59:36 +0000 (13:59 +0000)]
mpm_event(opt), mpm_worker: follow up to r1635521.
Allocate retained idle_spawn_rate vector on the process pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640161 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 17 Nov 2014 11:45:29 +0000 (11:45 +0000)]
mpm_worker, mpm_prefork: follow up to r1635521.
Use one dedicated accept mutex per listeners bucket.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640145 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 22:27:48 +0000 (22:27 +0000)]
Follow up to r1640040: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640042 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 22:25:32 +0000 (22:25 +0000)]
mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error
when parsing or forwarding the response fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640040 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 22:04:39 +0000 (22:04 +0000)]
mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org)
Fix a potential crash with response headers' size above 8K.
The code changes to mod_authnz_fcgi keep the handle_headers()
function in sync between the two modules. mod_authnz_fcgi
does not have this issue because it allocated a separate byte
for terminating '\0'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640036 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 21:52:40 +0000 (21:52 +0000)]
Revert r1638818, r1639812, r1639717 and r1639814 for new staging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640034 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 16 Nov 2014 21:32:48 +0000 (21:32 +0000)]
event, eventopt: follow up to r1638879 and r1639960.
Clear the pool in ap_push_pool() before recycling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1640031 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 16 Nov 2014 05:55:14 +0000 (05:55 +0000)]
avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
in several paths where ptrans is being recycled at the end of a request.
Same as r1638879 which was for the event MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639960 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 15 Nov 2014 00:37:13 +0000 (00:37 +0000)]
mod_authnz_fcgi: follow up to r1639717.
Let ap_scan_script_header*() validate the headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639814 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 15 Nov 2014 00:35:37 +0000 (00:35 +0000)]
mod_proxy_fcgi: follow up to r1638818.
Let ap_scan_script_header*() validate the headers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639812 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 14 Nov 2014 18:18:15 +0000 (18:18 +0000)]
mod_authnz_fcgi: Fix a potential crash with response headers' size above 8K.
(similar to r1638818 for mod_proxy_fcgi).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639717 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Nov 2014 12:04:46 +0000 (12:04 +0000)]
don't call notify_suspend() in a worker thread after
start_lingering_close_common may have put the socket back
into the pollset.
If it becomes readable too quickly, cs can be
free'ed or accessed concurrently.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639614 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Nov 2014 02:24:40 +0000 (02:24 +0000)]
revert r1638691, more comprehensive followup planned shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1639564 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Nov 2014 17:32:24 +0000 (17:32 +0000)]
avoid dereferencing a recently apr_pool_clear()'ed event_conn_state_t *cs
in several paths where ptrans is being recycled at the end of a request.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638879 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 12 Nov 2014 15:41:07 +0000 (15:41 +0000)]
mod_proxy_fcgi: CVE-2014-3583: Fix a potential crash with response headers'
size above 8K.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638818 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Wed, 12 Nov 2014 12:27:09 +0000 (12:27 +0000)]
* mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory leak
in mod_ssl on graceful restart. PR 53435.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638772 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Nov 2014 02:29:38 +0000 (02:29 +0000)]
Fix a bug in r1604350 that can lead to crashes in the event MPM under load.
if start_lingering_close_blocking() returns 0, notify_suspend() will
write a 1 into some potentially recently free'd memory from
ptrans (cs->suspended).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638691 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Nov 2014 01:46:28 +0000 (01:46 +0000)]
see your doctor about any rashes since r1608202.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638687 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 11 Nov 2014 21:16:11 +0000 (21:16 +0000)]
tab vs space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638412 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 11 Nov 2014 15:40:06 +0000 (15:40 +0000)]
Fix style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1638188 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log