]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Joe Orton [Fri, 3 Jul 2009 13:48:25 +0000 (13:48 +0000)]
Merge r790587 from trunk:
Security fix for CVE-2009-1890:
* modules/proxy/mod_proxy_http.c (stream_reqbody_cl): Specify the base
passed to apr_strtoff, and validate the Content-Length in the same
way the HTTP_IN filter does. If the number of bytes streamed
exceeds the expected body length, bail out of the loop.
Thanks to: Toadie <toadie643 gmail.com> for reporting and diagnosis of
this issue.
Submitted by: niq, jorton
Reviewed by: rpluem, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790914
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Jul 2009 11:59:12 +0000 (11:59 +0000)]
Merge r776325 from trunk:
Fix the error string returned by RewriteRule. RewriteRule returned "RewriteCond: bad flag delimiters" when the 3rd argument of RewriteRule was not started with "[" or not ended with "]".
PR: 45082
Submitted by: Vitaly Polonetsky <m_vitaly topixoft.com>
Submitted by: takashi
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790878
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Jul 2009 11:57:02 +0000 (11:57 +0000)]
Merge r395552 from trunk:
* modules/proxy/proxy_util.c (ap_proxy_initialize_worker): Fix
gcc strict-aliasing warning.
Submitted by: jorton
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790876
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Jul 2009 11:55:34 +0000 (11:55 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790875
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 3 Jul 2009 11:54:58 +0000 (11:54 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790874
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 3 Jul 2009 09:53:03 +0000 (09:53 +0000)]
Propose fixes for the mod_deflate DoS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790840
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 3 Jul 2009 08:00:06 +0000 (08:00 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790822
13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 3 Jul 2009 07:57:19 +0000 (07:57 +0000)]
update for sync with English doc.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790821
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 2 Jul 2009 21:30:36 +0000 (21:30 +0000)]
additional (mod_perl test suite) OPT_INCLUDES compatibility
Submitted by: jorton
Reviewed by: trawick, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790738
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Jul 2009 18:53:57 +0000 (18:53 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790711
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 2 Jul 2009 18:53:15 +0000 (18:53 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790709
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 2 Jul 2009 17:22:54 +0000 (17:22 +0000)]
CVE-2009-1890
(tests out okay on 2.2.x with Joe's new testcase, but I'll try to look at it
a little more before voting)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790690
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 2 Jul 2009 01:21:06 +0000 (01:21 +0000)]
note intent to release.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@790432
13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 27 Jun 2009 16:59:36 +0000 (16:59 +0000)]
Fixed comment. Submitted by Arfrever Frehtes Taifersar Arahesis.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@788997
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 24 Jun 2009 09:46:30 +0000 (09:46 +0000)]
Merge r641855 from trunk:
Update Timeout section, the semantics changed completely
since 1.3 and the caveats on signals not being reset
thankfully no longer apply either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@787961
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 20 Jun 2009 13:55:52 +0000 (13:55 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@786826
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 20 Jun 2009 13:54:23 +0000 (13:54 +0000)]
* Add comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@786825
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 18 Jun 2009 09:22:59 +0000 (09:22 +0000)]
Add note about the APR-util security fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@785982
13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 17 Jun 2009 12:54:28 +0000 (12:54 +0000)]
Propose backport before I forget the details and motivation of it ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@785576
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Jun 2009 15:44:53 +0000 (15:44 +0000)]
Some typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@784408
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 11 Jun 2009 12:07:14 +0000 (12:07 +0000)]
* Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@783731
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 11 Jun 2009 12:03:42 +0000 (12:03 +0000)]
* Add compatibility note.
Submitted by: Dan Poirier <poirier pobox.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@783730
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 10 Jun 2009 19:40:01 +0000 (19:40 +0000)]
AccessConfig and ResourceConfig have been gone for how long?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@783467
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Jun 2009 01:30:54 +0000 (01:30 +0000)]
doc xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782863
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Jun 2009 01:28:50 +0000 (01:28 +0000)]
compat mentioned in env.xml, echo in inline reference
in CacheEnable/CacheDisable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782861
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 7 Jun 2009 18:44:12 +0000 (18:44 +0000)]
one more vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782424
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 7 Jun 2009 15:29:53 +0000 (15:29 +0000)]
Pick up the win32 notes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782400
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sun, 7 Jun 2009 15:29:21 +0000 (15:29 +0000)]
Add windows build notes before any 2.2.X release, which should help
users with the integration notes for obtaining 3rd party db drivers.
This file was shipped in the tarball as a dist artifact, but it
better belongs in the httpd tree to warn users about the first pipe
handling issue if they are rolling their own.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782399
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 7 Jun 2009 13:22:13 +0000 (13:22 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782386
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 7 Jun 2009 13:20:12 +0000 (13:20 +0000)]
use proper xml
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782385
13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 7 Jun 2009 13:17:09 +0000 (13:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782384
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 7 Jun 2009 11:54:41 +0000 (11:54 +0000)]
Some typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782374
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 6 Jun 2009 15:07:54 +0000 (15:07 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782268
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 6 Jun 2009 14:55:56 +0000 (14:55 +0000)]
* This showstopper is now moot: APR / APR-UTIL were released.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782267
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 6 Jun 2009 03:10:28 +0000 (03:10 +0000)]
Two proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@782183
13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 3 Jun 2009 15:12:11 +0000 (15:12 +0000)]
Note IndexHeadInsert is available in >= 2.2.11.
PR:47297
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@781422
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 31 May 2009 15:39:39 +0000 (15:39 +0000)]
Somes typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@780459
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 28 May 2009 08:04:03 +0000 (08:04 +0000)]
Restore backwards compatibility of OPT_* handling in the fix for
CVE-2009-1195:
* include/http_core.h: Add back the OPT_INCNOEXEC and hide
OPT_INC_WITH_EXEC as internal-only.
* server/core.c (ap_allow_options): Invert the returned
OPT_INC_WITH_EXEC bit such that the exposed semantics of
OPT_INCNOEXEC are retained.
* modules/filters/mod_include.c (includes_filter): Revert to using
OPT_INCNOEXEC.
Submitted by: trawick, jorton
Reviewed by: jorton, trawick, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@779472
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 28 May 2009 02:26:56 +0000 (02:26 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@779404
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 27 May 2009 20:00:53 +0000 (20:00 +0000)]
Thanks, Joe!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@779292
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 27 May 2009 14:06:00 +0000 (14:06 +0000)]
Formal proposal for fix to CVE-2009-1195 compat issue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@779180
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Wed, 27 May 2009 12:48:35 +0000 (12:48 +0000)]
ome typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@779150
13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 May 2009 16:04:21 +0000 (16:04 +0000)]
try to entice some others to join the API preservation thread
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@778447
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 21 May 2009 18:40:49 +0000 (18:40 +0000)]
two user-visible changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777213
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:32:26 +0000 (17:32 +0000)]
Committed revision 777193.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777194
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:31:52 +0000 (17:31 +0000)]
* log: Provide "||program" syntax to optionally restore behavior broken in
2.0.50 which leads to bad process handling on Solaris and wasted process
resources on all platforms.
Trunk version (new behavior);
http://svn.apache.org/viewvc?view=rev&revision=775300
http://svn.apache.org/viewvc?view=rev&revision=775320
Proposed 2.2.12 patch, retaining default behavior from 2.2.11;
http://people.apache.org/~wrowe/fixlog22.patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777193
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:30:28 +0000 (17:30 +0000)]
Committed revision 777191.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777192
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:30:07 +0000 (17:30 +0000)]
Merge r771587, r771610 from trunk:
As mentioned inline in comments, correctly handle more sophisticated
transformations which currently fail for balancer://foo targets, but
work just fine with other ProxyReverse targets.
The balancer comparison is a bit trickier. Given the context
BalancerMember balancer://alias http://example.com/foo
ProxyPassReverse /bash balancer://alias/bar
translate url http://example.com/foo/bar/that to /bash/that
E.g. there may be several different url-suffixes (1st order) of any
particular BalancerMember set e.g. /app1, /app1 and /appbeta while
there may be additional suffixes associated with the actual
ProxyPassReverse directive. Neither were properly reversed, now
both should be properly handled.
One *critical* assumption;
BalancerMember balancer://alias/foo http://example.com/bar
should be documented as a meaningless construct, since one cannot
have two members, balancer://alias/foo and balancer://alias/bar,
and the balancer member structures discard this path.
Note one more existing error case as an XXX comment due to invalid
uri comparisons.
* Silence compiler warning.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777191
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:28:34 +0000 (17:28 +0000)]
Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777188
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 May 2009 17:28:14 +0000 (17:28 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777187
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 21 May 2009 11:40:34 +0000 (11:40 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777079
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 21 May 2009 11:17:49 +0000 (11:17 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@777067
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 19 May 2009 20:06:59 +0000 (20:06 +0000)]
raise a question, remove all snarky commentary
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776436
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 19 May 2009 19:48:50 +0000 (19:48 +0000)]
reference PR's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776433
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 May 2009 11:46:27 +0000 (11:46 +0000)]
Update docco xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776284
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 May 2009 11:44:59 +0000 (11:44 +0000)]
* mod_ssl: Add server name indication support (RFC 4366) and better
support for name based virtual hosts with SSL. PR 34607
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776281
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 May 2009 11:41:37 +0000 (11:41 +0000)]
Merge r769809 from trunk:
* Improve and simplify the implementation of SSLProxyCheckPeerExpire by
directly using X509_get_notBefore(), X509_get_notAfter() and
X509_cmp_current_time().
Thanks to jorton for the pointer.
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776279
13f79535 -47bb-0310-9956-
ffa450edef68
Philip M. Gollucci [Tue, 19 May 2009 06:07:55 +0000 (06:07 +0000)]
o vote and promote 2 patches
o formally unstall the pcre debate
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@776195
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 17 May 2009 20:50:50 +0000 (20:50 +0000)]
Vote on a "clarification" fix :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@775757
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 15 May 2009 20:42:01 +0000 (20:42 +0000)]
Revised proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@775323
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 15 May 2009 20:25:12 +0000 (20:25 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@775314
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 12:24:51 +0000 (12:24 +0000)]
Update docco xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774746
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 12:24:31 +0000 (12:24 +0000)]
English xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774745
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 12:24:07 +0000 (12:24 +0000)]
Spanish xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774744
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 12:23:51 +0000 (12:23 +0000)]
German xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774743
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 14 May 2009 12:23:17 +0000 (12:23 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774742
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 13 May 2009 21:51:21 +0000 (21:51 +0000)]
merge from trunk r774530
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774547
13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Wed, 13 May 2009 19:50:58 +0000 (19:50 +0000)]
merge from trunk r774184
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774501
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 13 May 2009 17:30:21 +0000 (17:30 +0000)]
Yeppers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774443
13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 13 May 2009 01:41:23 +0000 (01:41 +0000)]
Adds [NE] to the canonical hostname rules, as per
https://issues.apache.org/bugzilla/show_bug.cgi?id=47186 to avoid
double-escaping of URIs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@774162
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 12 May 2009 13:23:01 +0000 (13:23 +0000)]
move SECURITY to top
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773882
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 12 May 2009 13:17:29 +0000 (13:17 +0000)]
backport 772997, 773322, 773342 from trunk.
Reviewed By: jorton, rpluem, covener
Security fix for CVE-2009-1195: fix Options handling such that
'AllowOverride Options=IncludesNoExec' does not permit Includes with
exec= enabled to be configured in an .htaccess file:
* include/http_core.h: Change semantics of Includes/IncludeNoExec
options bits to be additive; OPT_INCLUDES now means SSI is enabled
without exec=. OPT_INCLUDES|OPT_INC_WITH_EXEC means SSI is enabled
with exec=.
* server/core.c (create_core_dir_config): Remove defunct OPT_INCNOEXEC
from default override_opts; no functional change.
(merge_core_dir_configs): Update logic to ensure that exec= is
disabled in a context where IncludesNoexec is configured, even if
Includes-with-exec is permitted in the inherited options set.
(set_allow_opts, set_options): Update to reflect new semantics
of OPT_INCLUDES, OPT_INC_WITH_EXEC.
* server/config.c: Update to remove OPT_INCNOEXEC from default
override_opts; no functional change.
* modules/filters/mod_include.c (includes_filter): Update to reflect
new options semantics - disable exec= support if the
OPT_INC_WITH_EXEC bit is not set.
Submitted by: Jonathan Peatfield <j.s.peatfield damtp.cam.ac.uk>,
jorton
Thanks to: Vincent Danon <vdanon redhat.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773881
13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 12 May 2009 13:13:31 +0000 (13:13 +0000)]
vote & promote CVE-2009-1195
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773880
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 10 May 2009 15:11:46 +0000 (15:11 +0000)]
Merge r752812 from trunk:
* Escape pathes of filenames in 406 responses to avoid HTML injections and
HTTP response splitting.
PR: 46837
Submitted by: Geoff Keating <geoffk apple.com>
Reviewed by: rpluem, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773354
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 10 May 2009 15:09:45 +0000 (15:09 +0000)]
Merge r757376 from trunk:
Prevent a case of SSI timefmt-smashing with filter chains including
multiple INCLUDES filters:
* modules/filters/mod_include.c (add_include_vars): Drop unused
timefmt argument.
(add_include_vars_lazy): Take timefmt argument.
(get_include_var, handle_printenv): Pass time format from context.
PR: 39369
Submitted by: jorton
Reviewed by: rpluem, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773352
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 10 May 2009 15:06:26 +0000 (15:06 +0000)]
Merge r757427 from trunk:
* modules/mappers/mod_rewrite.c (apply_rewrite_rule): When evaluating
a proxy rule in directory context, do escape the filename by
default, since mod_proxy will not escape in that case due to the
(deliberate) fixup hook ordering.
Thanks to: rpluem
PR: 46428
Submitted by: jorton
Reviewed by: rpluem, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773351
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sun, 10 May 2009 15:02:21 +0000 (15:02 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773348
13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Sun, 10 May 2009 14:42:51 +0000 (14:42 +0000)]
Propose CVE-2009-1195 backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773345
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 8 May 2009 18:14:49 +0000 (18:14 +0000)]
fix whitespace, explanation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773058
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 8 May 2009 18:13:06 +0000 (18:13 +0000)]
vote and promote 3 patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@773056
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 6 May 2009 18:25:03 +0000 (18:25 +0000)]
propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@772393
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 6 May 2009 18:17:12 +0000 (18:17 +0000)]
Commit no-op/comment to allow proposed backport to apply cleanly' proxy_util.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@772388
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 5 May 2009 18:53:22 +0000 (18:53 +0000)]
* Revive old proposal, update it and reset comments and votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771967
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 4 May 2009 20:40:48 +0000 (20:40 +0000)]
Committed revision 771433.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771434
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 4 May 2009 20:40:20 +0000 (20:40 +0000)]
Merge r680082 from trunk:
Change r->content_type when mod_headers sets the Content-Type header
Submitted by: issac
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771433
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 4 May 2009 20:39:31 +0000 (20:39 +0000)]
approve
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771430
13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 4 May 2009 20:39:02 +0000 (20:39 +0000)]
Cast votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771429
13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 4 May 2009 15:02:36 +0000 (15:02 +0000)]
Add Ctrl-Break to Windows platform docs
(triggers restart for console use).
Documentation backport of r769134 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771328
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 4 May 2009 09:32:15 +0000 (09:32 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771255
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 4 May 2009 09:04:27 +0000 (09:04 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771249
13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 3 May 2009 15:45:18 +0000 (15:45 +0000)]
One typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@771068
13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 30 Apr 2009 17:21:04 +0000 (17:21 +0000)]
Arrange BalancerMember explainations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@770332
13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 27 Apr 2009 21:09:14 +0000 (21:09 +0000)]
propose mod_headers content-type handling for 2.2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@769163
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 14:20:27 +0000 (14:20 +0000)]
Merge r768535 from trunk:
* Fix an error in the documentation.
Submitted by: rpluem
Reviewed by: pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768536
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 10:04:21 +0000 (10:04 +0000)]
Merge r764239 from trunk:
* Check more strictly that the backend follows the AJP protocol.
Submitted by: mturk
Reviewed by: rpluem, jim, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768507
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 09:58:52 +0000 (09:58 +0000)]
Merge r763394 from trunk:
* Avoid delivering content from a previous request which failed to send a request
body by closing the connection to the backend in this case instead of reusing it.
CVE: CVE-2009-1191 (cve.mitre.org)
PR: 46949
Submitted by: rpluem
Reviewed by: rpluem, wrowe, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768506
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 09:50:27 +0000 (09:50 +0000)]
Backport of r760866:
* Add SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN directives to enable
stricter checking of remote server certificates.
(docs/manual/mod/mod_ssl.xml)
Documentation of SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.
(modules/proxy/mod_proxy_http.c)
Set the hostname of the request URL as note on the connection.
(modules/ssl/ssl_private.h)
Add proxy_ssl_check_peer_expire and proxy_ssl_check_peer_cn fields to
the SSLSrvConfigRec.
(modules/ssl/ssl_engine_config.c)
Directives stuff for SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.
(modules/ssl/ssl_engine_io.c)
Check whether the remote servers certificate is expired / if there is a
mismatch between the requested hostanme and the remote server certificates
CN field.
Be able to parse ASN1 times.
(modules/ssl/mod_ssl.c)
Directives stuff for SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN.
Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768504
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 09:43:38 +0000 (09:43 +0000)]
* Correct logic with non-seq lbsets config'ed
Submitted by: jim
Reviewed by: jim, rpluem, jfclere
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768503
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 25 Apr 2009 09:38:29 +0000 (09:38 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768502
13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Apr 2009 06:13:23 +0000 (06:13 +0000)]
* Add a comment to the showstoppers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@767815
13f79535 -47bb-0310-9956-
ffa450edef68