git.ipfire.org Git - thirdparty/apache/httpd.git/log

]> git.ipfire.org Git - thirdparty/apache/httpd.git/log

projects / thirdparty / apache / httpd.git / log

Jeff Trawick [Tue, 15 Jul 2014 01:46:35 +0000 (01:46 +0000)]

easy vote, more tomorrow I hope...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610566 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 14 Jul 2014 21:02:52 +0000 (21:02 +0000)]

propose CVE-2014-0118 backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610527 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Mon, 14 Jul 2014 20:46:42 +0000 (20:46 +0000)]

propose CVE-2014-0231

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610519 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Joe Orton [Mon, 14 Jul 2014 20:34:32 +0000 (20:34 +0000)]

Merge 1610491 from trunk:

SECURITY (CVE-2014-0226): Fix a race condition in scoreboard handling,
which could lead to a heap buffer overflow. Thanks to Marek Kroemeke
working with HP's Zero Day Initiative for reporting this.

* include/scoreboard.h: Add ap_copy_scoreboard_worker.

* server/scoreboard.c (ap_copy_scoreboard_worker): New function.

* modules/generators/mod_status.c (status_handler): Use it.

Reviewed by: trawick, jorton, covener
Submitted by: jorton, trawick, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610515 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Mon, 14 Jul 2014 06:10:50 +0000 (06:10 +0000)]

Add 2.4.x rev to proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610342 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Sun, 13 Jul 2014 22:51:57 +0000 (22:51 +0000)]

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610316 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rainer Jung [Sun, 13 Jul 2014 15:03:42 +0000 (15:03 +0000)]

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610224 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 13 Jul 2014 12:21:08 +0000 (12:21 +0000)]

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610177 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 13 Jul 2014 12:19:57 +0000 (12:19 +0000)]

Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610176 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ben Reser [Fri, 11 Jul 2014 03:56:30 +0000 (03:56 +0000)]

Vote for 2 mod_deflate backports for 2.2.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1609621 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 9 Jul 2014 16:45:51 +0000 (16:45 +0000)]

Add mod_deflate missing commits (present in 2.2.x patches).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1609239 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 9 Jul 2014 16:40:23 +0000 (16:40 +0000)]

Propose mod_deflate fixes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1609233 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 9 Jul 2014 14:38:11 +0000 (14:38 +0000)]

Vote and promote mod_dav fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1609180 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 9 Jul 2014 14:07:52 +0000 (14:07 +0000)]

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1609164 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ben Reser [Wed, 9 Jul 2014 01:44:05 +0000 (01:44 +0000)]

Fix a typo and add my vote I accidentally left off the PR 56480 nomination.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608981 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ben Reser [Wed, 9 Jul 2014 01:26:52 +0000 (01:26 +0000)]

Nominate the PR 56480 fix for 2.2.x backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608977 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Tue, 8 Jul 2014 16:14:05 +0000 (16:14 +0000)]

backport some consistency with trunks mod_cache:

   * mod_cache, mod_disk_cache: Try to use the key of a possible open but
     stale cache entry if there is one. This fixes problem when two different
     cache locks have been created for single stale cache entry leading to two
     requests sent to backend.
     PR 50317

   * Remove useless apr_file_remove() before renaming the cache entry in
     mod_disk_cache. This fixes small time-frame during which stale cache
     entry can be seen as not-cached.
     PR 50317

Subitted By: rpluem, jkaluza, ylavic
Reviewed By: ylavic, rpluem, jkaluza

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608838 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 6 Jul 2014 21:58:08 +0000 (21:58 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608305 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 6 Jul 2014 21:57:44 +0000 (21:57 +0000)]

   * mod_rewrite: Support session cookies with the CO= flag when later parameters
     are used.  The doc for this implied the feature had been backported for
     quite some time.  PR56014

Submitted by: covener
Reviewed by: covener, ylavic, rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608304 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 6 Jul 2014 21:55:03 +0000 (21:55 +0000)]

   * mod_cache: Don't remove stale cache entries that cannot be conditionally
     revalidated. This prevents the thundring herd protection from serving
     stale during a revalidation. Reverts most of r572626 which is also gone
     from later branches.   PR 50317.

Submitted By: covener, jkaluza, rpluem
Reviewed By: covener, jkaluza, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608302 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 6 Jul 2014 21:49:06 +0000 (21:49 +0000)]

Merge r501364 from trunk:

* server/listen.c (ap_apply_accept_filter): Bump TCP_DEFER_ACCEPT
argument to 30 units-of-unspecified-nature.

Submitted by: Dean Gaudet <dean arctic.org>
Reviewed by: ylavic, trawick, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1608298 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Sun, 15 Jun 2014 15:55:13 +0000 (15:55 +0000)]

Rebuild HTML

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1602715 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Sun, 15 Jun 2014 15:53:29 +0000 (15:53 +0000)]

Remove ancient IE-on-Mac example.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1602714 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Thu, 5 Jun 2014 00:22:23 +0000 (00:22 +0000)]

generated changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1600548 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Thu, 5 Jun 2014 00:20:25 +0000 (00:20 +0000)]

Fix spelling and grammar errors.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1600547 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Thu, 29 May 2014 18:43:23 +0000 (18:43 +0000)]

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598366 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Thu, 29 May 2014 18:42:35 +0000 (18:42 +0000)]

XML Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598364 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Thu, 29 May 2014 14:11:59 +0000 (14:11 +0000)]

Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598299 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Thu, 29 May 2014 14:10:52 +0000 (14:10 +0000)]

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598298 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jan Kaluža [Thu, 29 May 2014 07:59:36 +0000 (07:59 +0000)]

Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598215 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 28 May 2014 21:31:37 +0000 (21:31 +0000)]

* Vote and promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598148 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Wed, 28 May 2014 20:49:36 +0000 (20:49 +0000)]

Fix typo spotted on online doc by Louise Hope.
#comment_2558

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1598135 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Tue, 27 May 2014 12:55:11 +0000 (12:55 +0000)]

Votes, promotion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1597770 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jan Kaluža [Tue, 27 May 2014 05:50:54 +0000 (05:50 +0000)]

Vote, propose additional PR 50317 (thundering herd) fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1597706 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Fri, 23 May 2014 09:45:25 +0000 (09:45 +0000)]

HTML Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1597049 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Fri, 23 May 2014 09:43:52 +0000 (09:43 +0000)]

XML Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1597048 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Thu, 22 May 2014 21:15:34 +0000 (21:15 +0000)]

Fix typo spotted on online doc by Gerard H. Pille.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1596970 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Wed, 21 May 2014 19:19:33 +0000 (19:19 +0000)]

rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1596655 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Wed, 21 May 2014 18:48:48 +0000 (18:48 +0000)]

Add version number in <title>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1596648 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Thu, 15 May 2014 20:23:42 +0000 (20:23 +0000)]

Fix typo spotted on online doc.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1595035 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Wed, 14 May 2014 12:21:41 +0000 (12:21 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1594558 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Mike Rumph [Tue, 13 May 2014 18:02:37 +0000 (18:02 +0000)]

Fix some comment typos

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1594310 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Wed, 30 Apr 2014 12:36:50 +0000 (12:36 +0000)]

Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591272 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Wed, 30 Apr 2014 12:23:00 +0000 (12:23 +0000)]

Upsdates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591271 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 30 Apr 2014 11:33:13 +0000 (11:33 +0000)]

vote/promote TCP_DEFER_ACCEPT

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591258 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jeff Trawick [Wed, 30 Apr 2014 11:22:16 +0000 (11:22 +0000)]

+1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591252 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 30 Apr 2014 11:19:32 +0000 (11:19 +0000)]

Fix typo in backport proposal for r501364 (TCP_DEFER_ACCEPT).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591251 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Wed, 30 Apr 2014 11:16:09 +0000 (11:16 +0000)]

Propose backport for r501364 (TCP_DEFER_ACCEPT).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591248 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Wed, 30 Apr 2014 05:04:30 +0000 (05:04 +0000)]

Correct typo as spoted in a comment in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591195 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Wed, 30 Apr 2014 04:42:53 +0000 (04:42 +0000)]

Correct typo as spoted in a comment in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591192 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Tue, 29 Apr 2014 20:36:39 +0000 (20:36 +0000)]

Correct typo as spoted in a comment in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1591094 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Mon, 28 Apr 2014 15:06:22 +0000 (15:06 +0000)]

Correct typo as spoted in a comment in online doc

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1590664 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sun, 27 Apr 2014 13:54:21 +0000 (13:54 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1590394 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 20 Apr 2014 13:56:17 +0000 (13:56 +0000)]

propose CO= fix/feature for 2.2. PR 56014

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1588760 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Sun, 20 Apr 2014 13:49:42 +0000 (13:49 +0000)]

2.2 cannot set a session lifetime if any later fields are set,
it does not have http://svn.apache.org/viewvc?view=revision&revision=664333

But it had the backport of the refactoring of rewrite flags into
flags.xml, which referred to features added in 664333.

PR56014

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1588759 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Thu, 10 Apr 2014 19:35:15 +0000 (19:35 +0000)]

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1586446 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Thu, 10 Apr 2014 19:33:50 +0000 (19:33 +0000)]

Merge r1586437 from trunk:

This C-T: limitation was removed in 2.2.12 and retconned into CHANGES much later.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1586441 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Thu, 10 Apr 2014 13:39:28 +0000 (13:39 +0000)]

propose thunderin herd protection backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1586297 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Wed, 26 Mar 2014 21:50:25 +0000 (21:50 +0000)]

Appologies for being distracted and delayed release, on to Announcement...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1582081 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 15 Mar 2014 16:29:32 +0000 (16:29 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1577894 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Thu, 13 Mar 2014 19:56:51 +0000 (19:56 +0000)]

* We are now at 2.2.28

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1577302 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Thu, 13 Mar 2014 18:42:58 +0000 (18:42 +0000)]

And we are on to 2.2.28

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1577279 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Thu, 13 Mar 2014 18:40:37 +0000 (18:40 +0000)]

Preparing to tag 2.2.27

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1577277 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Thu, 13 Mar 2014 18:39:10 +0000 (18:39 +0000)]

User-facing CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1577276 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:43:51 +0000 (12:43 +0000)]

* Update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576717 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:41:07 +0000 (12:41 +0000)]

Merge r1575400 from trunk:

CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>)
Segfaults w/ truncated cookie logging.

Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies. This refactors multiple passes over the same string
buffer into a single pass parser.

Submitted by: wrowe
Reviewed by: rpluem, jim

Reviewed by: wrowe, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576716 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:37:48 +0000 (12:37 +0000)]

* This one is backported

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576715 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:37:06 +0000 (12:37 +0000)]

Merge r1572543 from trunk:

Cleanup the client to backend brigade before returning an error (if any) to avoid buckets lifetime issues (backend connection's pool destroyed before request's one). PR 50335.
Suggested by rpluem.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576714 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:32:51 +0000 (12:32 +0000)]

Merge r1553204, r1555240, r1572198 from trunk:

* Do not perform SNI / Host header comparison in case of a forward proxy request as
in case of a forward proxy request the host header can not be used for virtual
host selection in our webserver.

* Update comment. No functional change.

* Put a note in CHANGES about r1553204
Submitted by: rpluem
Reviewed by: rpluem, kbrand, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576713 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:28:03 +0000 (12:28 +0000)]

Merge r1493330, r1504276, r1552227, r1551714, r1490994, r1172732 from trunk:

Correct typo in error message

Unlikely potential memory leak.
Point 12 of PR 54936

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.

NULL terminate the right buffer

Fix issues found by PVS-Studio static analyzer:

mod_mime_magic:
cut'n'paste error rsl_encoding vs. rsl_separator, also simplify code a bit

mod_header:
wrong string initialization (leading to segfault if format argument is missing)

util_win32: duplicate sizeof (untested; Windows people, please review)

PR: 51542
Submitted by: Andrey Karpov <karpov viva64 com>, Stefan Fritsch

Reviewed by: jailletc36, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576709 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 12:18:51 +0000 (12:18 +0000)]

Merge r1524192, r1524770, r1527925 from trunk:

Update rationale

draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions
between TE and content-length in the same req/resp.

PR 55616 (add missing APLOGNO), part 1
Reviewed by: rpluem, ylavic, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576708 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 11:53:12 +0000 (11:53 +0000)]

* Remove mergeinfo from single files / directories. We track merging at the root.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576707 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Mar 2014 11:50:49 +0000 (11:50 +0000)]

Merge r1556428 from trunk:

SECURITY: CVE-2013-6438 (cve.mitre.org)
mod_dav: Keep track of length of cdata properly when removing leading spaces.

* modules/dav/main/util.c
(dav_xml_get_cdata): reduce len variable when increasing cdata pointer.

Submitted by: Amin Tora <Amin.Tora neustar.biz>

Reviewed by: breser, rpluem, gstein, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576706 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Tue, 11 Mar 2014 20:58:07 +0000 (20:58 +0000)]

SNI reuse checks backport proposal with MMN bump.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576502 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Tue, 11 Mar 2014 20:36:14 +0000 (20:36 +0000)]

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576495 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Tue, 11 Mar 2014 20:15:44 +0000 (20:15 +0000)]

* Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576490 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Mar 2014 19:41:29 +0000 (19:41 +0000)]

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576483 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 10 Mar 2014 12:12:38 +0000 (12:12 +0000)]

Propose mod_proxy's SNI reuse checks to 2.2.x backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1575920 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Mon, 10 Mar 2014 11:21:34 +0000 (11:21 +0000)]

Vote for r1575400 backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1575903 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 21:02:24 +0000 (21:02 +0000)]

With enough eyeballs, all bugs are shallow. One more for your consideration.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1575405 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Fri, 7 Mar 2014 20:22:52 +0000 (20:22 +0000)]

Endorsements of all open 2.2 backport votes, anyone is welcome to commit these

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1575390 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Kaspar Brand [Sun, 2 Mar 2014 14:33:26 +0000 (14:33 +0000)]

vote for 'skip SNI check for forward proxy requests' proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573314 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 10:52:13 +0000 (10:52 +0000)]

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573281 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Nilgun Belma Buguner [Sun, 2 Mar 2014 10:51:04 +0000 (10:51 +0000)]

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573280 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Fri, 28 Feb 2014 20:42:50 +0000 (20:42 +0000)]

Merge r1534321, r1550061 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_request): Use the same
  brigade lifetime for the header brigade as the other brigades.
  POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded
  servers, e.g. PR 50335; appears correct or at least not harmful.

PR: 50335

Cleanup the bb brigade, because buckets inserted to it can be created from
scpool and this pool can be freed before this brigade.
POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded servers,
e.g. PR 50335.

Reviewed by: rpluem, jorton, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573067 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Fri, 28 Feb 2014 20:36:34 +0000 (20:36 +0000)]

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573064 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 13:58:04 +0000 (13:58 +0000)]

Propose r1572543.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1572576 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2014 10:10:59 +0000 (10:10 +0000)]

Votes + note on r1524770 discussion on dev@

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1572494 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 26 Feb 2014 20:15:02 +0000 (20:15 +0000)]

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1572227 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Ruediger Pluem [Wed, 26 Feb 2014 19:50:08 +0000 (19:50 +0000)]

* Add proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1572218 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Christophe Jaillet [Sat, 22 Feb 2014 21:42:17 +0000 (21:42 +0000)]

Proposals

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1570930 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 18:03:52 +0000 (18:03 +0000)]

stabilize sort for latex build as well

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1570869 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Sat, 22 Feb 2014 17:48:56 +0000 (17:48 +0000)]

handle duplicate directives by sorting directive lists additionally by module name

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1570865 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

William A. Rowe Jr [Thu, 20 Feb 2014 09:49:20 +0000 (09:49 +0000)]

Yup

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1570124 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Thu, 13 Feb 2014 17:48:33 +0000 (17:48 +0000)]

rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1567984 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Rich Bowen [Thu, 13 Feb 2014 17:31:09 +0000 (17:31 +0000)]

Remove Netscape 4.x advice.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1567982 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Eric Covener [Wed, 12 Feb 2014 17:20:24 +0000 (17:20 +0000)]

2.2.26 was announced 11/18/2013

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1567691 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

André Malo [Tue, 11 Feb 2014 08:07:00 +0000 (08:07 +0000)]

update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1567007 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Sat, 8 Feb 2014 15:20:22 +0000 (15:20 +0000)]

Update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1566028 13f79535-47bb-0310-9956-ffa450edef68

commit | commitdiff | tree

Lucien Gentis [Fri, 7 Feb 2014 17:42:14 +0000 (17:42 +0000)]

Updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1565740 13f79535-47bb-0310-9956-ffa450edef68

Mirror of https://github.com/apache/httpd.git

RSS Atom