]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
11 years agoFix typo.
Rainer Jung [Fri, 18 Jul 2014 11:30:09 +0000 (11:30 +0000)] 
Fix typo.

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

11 years agoadd patch/proposal for CVE-2013-5704 trailers thing
Eric Covener [Fri, 18 Jul 2014 01:00:08 +0000 (01:00 +0000)] 
add patch/proposal for CVE-2013-5704 trailers thing

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

11 years agodrop CVE-2014-0117 proposal, 2.2 not affected
Eric Covener [Thu, 17 Jul 2014 22:45:50 +0000 (22:45 +0000)] 
drop CVE-2014-0117 proposal, 2.2 not affected

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

11 years agoAnd... vote some
William A. Rowe Jr [Thu, 17 Jul 2014 22:43:14 +0000 (22:43 +0000)] 
And... vote some

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

11 years agoDelete BOM, wrap before 80 col
William A. Rowe Jr [Thu, 17 Jul 2014 20:40:36 +0000 (20:40 +0000)] 
Delete BOM, wrap before 80 col

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

11 years agoMerge r1572896, r1572911, r1603156 from trunk:
Jim Jagielski [Thu, 17 Jul 2014 18:21:59 +0000 (18:21 +0000)] 
Merge r1572896, r1572911, r1603156 from trunk:

mod_deflate:
Don't fail when asked to flush inflated data to the user-agent and that
coincides with the end of stream ("Zlib error flushing inflate buffer").
PR 56196.

Submitted By: [Christoph Fausak <christoph.fausak glueckkanja com>]
Committed By: ylavic

mod_deflate: follows up r1572896.
Be safe from successive or post end-of-stream flush buckets.

Add missing CHANGES entries for r1572655,1572663,1572668-1572671,1573224,1586745,1587594,1587639,1590509, r1572092, and r1572896,1572911.
Submitted by: ylavic
Reviewed/backported by: jim

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

11 years agoMerge r1610501 from trunk:
Jim Jagielski [Thu, 17 Jul 2014 18:20:46 +0000 (18:20 +0000)] 
Merge r1610501 from trunk:

  *) SECURITY: CVE-2014-0118 (cve.mitre.org)
     mod_deflate: The DEFLATE input filter (inflates request bodies) now
     limits the length and compression ratio of inflated request bodies to avoid
     denial of sevice via highly compressed bodies.  See directives
     DeflateInflateLimitRequestBody, DeflateInflateRatioLimit,
     and DeflateInflateRatioBurst.

Thanks to Giancarlo Pellegrino and Davide Balzarotti for reporting the issue.

Submitted By: ylavic, covener
Reviewed By: jorton, covener, jim

Submitted by: covener
Reviewed/backported by: jim

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

11 years agopromote
Jim Jagielski [Thu, 17 Jul 2014 18:19:00 +0000 (18:19 +0000)] 
promote

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

11 years agovote
Jim Jagielski [Thu, 17 Jul 2014 18:18:43 +0000 (18:18 +0000)] 
vote

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

11 years agoWithdrawal.
Yann Ylavic [Thu, 17 Jul 2014 17:45:03 +0000 (17:45 +0000)] 
Withdrawal.

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

11 years agochecks out for me
Eric Covener [Thu, 17 Jul 2014 11:36:51 +0000 (11:36 +0000)] 
checks out for me

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

11 years agoCVE-2014-0117 does not seem to apply to 2.2.x, second set of eyeballs welcome.
Joe Orton [Thu, 17 Jul 2014 11:17:39 +0000 (11:17 +0000)] 
CVE-2014-0117 does not seem to apply to 2.2.x, second set of eyeballs welcome.

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

11 years agoFooled by weird "svn merge" failing to fail... no this patch doesn't apply.
Joe Orton [Thu, 17 Jul 2014 10:52:03 +0000 (10:52 +0000)] 
Fooled by weird "svn merge" failing to fail... no this patch doesn't apply.

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

11 years agoVote, promote.
Joe Orton [Thu, 17 Jul 2014 10:47:09 +0000 (10:47 +0000)] 
Vote, promote.

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

11 years agoCorrect CHANGES entry with attribution
William A. Rowe Jr [Wed, 16 Jul 2014 21:19:48 +0000 (21:19 +0000)] 
Correct CHANGES entry with attribution

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

11 years agoFix PR 56480: PROPFIND walker doesn't encode hrefs properly
William A. Rowe Jr [Wed, 16 Jul 2014 21:03:30 +0000 (21:03 +0000)] 
Fix PR 56480: PROPFIND walker doesn't encode hrefs properly

Reverts r1529559 partially (specifically the dav_xml_escape_uri) bit.
Reverts r1531505 entirely.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Revert the piece of r1529559 that removes the URI
    escaping from this function.

* modules/dav/main/props.c
  (dav_do_prop_subreq): Escape the URI before doing a sub request with it.
    This resolves some properties like getcontenttype from failing to be
    returned for files that contain characters that require encoding in their
    path.

* modules/dav/main/mod_dav.h
  (dav_resource): Note the inconsistency in the documentation.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Don't use the unparsed_uri to set the uri field of
    the resource.  This is the correct fix for the double encoding in mod_dav_fs
    that led to the dav_xml_escape_uri() change and r1531505.
  (dav_fs_walker, dav_fs_append_uri): Revert r1531505 changes.

Submitted by: breser
PR: 56480
Backports: r1602338
Reviewed by: breser, rpluem, ylavic

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

11 years agoSECURITY: CVE-2014-0231
William A. Rowe Jr [Wed, 16 Jul 2014 20:56:51 +0000 (20:56 +0000)] 
SECURITY: CVE-2014-0231

  mod_cgid: Fix a denial of service against CGI scripts that do
  not consume stdin that could lead to lingering HTTPD child processes
  filling up the scoreboard and eventually hanging the server.

Submitted by: Rainer Jung, Eric Covener, Yann Ylavic
Backports: r1610509, r1535125
Reviewed by: covener, trawick, ylavic

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

11 years agoPropose utf-8 service names for winnt
William A. Rowe Jr [Wed, 16 Jul 2014 20:26:27 +0000 (20:26 +0000)] 
Propose utf-8 service names for winnt

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

11 years agoVote.
Yann Ylavic [Wed, 16 Jul 2014 13:16:24 +0000 (13:16 +0000)] 
Vote.

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

11 years agoExtend the scope of SSLSessionCacheTimeout to sessions
Rainer Jung [Wed, 16 Jul 2014 06:04:38 +0000 (06:04 +0000)] 
Extend the scope of SSLSessionCacheTimeout to sessions
resumed by TLS session resumption (RFC 5077).

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

11 years agoget proposal CVE-2014-0117 on the books
Eric Covener [Wed, 16 Jul 2014 01:03:29 +0000 (01:03 +0000)] 
get proposal CVE-2014-0117 on the books

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

11 years agovote/promote
Eric Covener [Wed, 16 Jul 2014 00:37:07 +0000 (00:37 +0000)] 
vote/promote

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

11 years agoMerge r1610207 from trunk resp. r1610340 from 2.4.x:
Rainer Jung [Tue, 15 Jul 2014 22:07:19 +0000 (22:07 +0000)] 
Merge r1610207 from trunk resp. r1610340 from 2.4.x:

Forward local IP address as a custom request attribute
like we already do for the remote port.

Both were forgotten in the original AJP 13 spec
but are needed by the Servlet spec. Until now,
Tomcat simply returns for getLocalAddr() the same as
for getLocalName().

The next round of Tomcat releases will look for the
optional new request attribute.

See also Tomcat BZ 56661.

Submitted by: rjung
Reviewed by: trawick, ylavic

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

11 years agoAdd comment about how to merge CHANGES entry wrt r1587201.
Yann Ylavic [Tue, 15 Jul 2014 14:42:31 +0000 (14:42 +0000)] 
Add comment about how to merge CHANGES entry wrt r1587201.

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

11 years agoVotes, 2.4.x patches references, and new proposal already backported to 2.4.8.
Yann Ylavic [Tue, 15 Jul 2014 12:40:43 +0000 (12:40 +0000)] 
Votes, 2.4.x patches references, and new proposal already backported to 2.4.8.

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

11 years agovote...
Jeff Trawick [Tue, 15 Jul 2014 11:08:34 +0000 (11:08 +0000)] 
vote...

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

11 years agoeasy vote, more tomorrow I hope...
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

11 years agopropose CVE-2014-0118 backport
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

11 years agopropose CVE-2014-0231
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

11 years agoMerge 1610491 from trunk:
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

11 years agoAdd 2.4.x rev to proposal.
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

11 years agoPropose.
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

11 years agoPropose.
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

11 years agoRebuild.
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

11 years agoUpdate.
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

11 years agoVote for 2 mod_deflate backports for 2.2.x
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

11 years agoAdd mod_deflate missing commits (present in 2.2.x patches).
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

11 years agoPropose mod_deflate fixes.
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

11 years agoVote and promote mod_dav fix.
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

11 years ago* Vote
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

11 years agoFix a typo and add my vote I accidentally left off the PR 56480 nomination.
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

11 years agoNominate the PR 56480 fix for 2.2.x backport.
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

11 years agobackport some consistency with trunks mod_cache:
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

11 years agoxforms
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

11 years ago * mod_rewrite: Support session cookies with the CO= flag when later parameters
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

11 years ago * mod_cache: Don't remove stale cache entries that cannot be conditionally
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

11 years agoMerge r501364 from trunk:
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

11 years agoRebuild HTML
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

11 years agoRemove ancient IE-on-Mac example.
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

11 years agogenerated changes
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

11 years agoFix spelling and grammar errors.
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

11 years agoRebuild.
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

11 years agoXML Update.
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

11 years agoRebuild.
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

11 years agoXML update.
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

11 years agoVote and promote.
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

11 years ago* Vote and promote
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

11 years agoFix typo spotted on online doc by Louise Hope.
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

11 years agoVotes, promotion.
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

11 years agoVote, propose additional PR 50317 (thundering herd) fix.
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

11 years agoHTML Updates.
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

11 years agoXML Update.
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

11 years agoFix typo spotted on online doc by Gerard H. Pille.
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

11 years agorebuild
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

11 years agoAdd version number in <title>
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

11 years agoFix typo spotted on online doc.
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

11 years agoUpdates.
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

11 years agoFix some comment typos
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

11 years agoUpdate.
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

11 years agoUpsdates.
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

11 years agovote/promote TCP_DEFER_ACCEPT
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

11 years ago+1
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

11 years agoFix typo in backport proposal for r501364 (TCP_DEFER_ACCEPT).
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

11 years agoPropose backport for r501364 (TCP_DEFER_ACCEPT).
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

11 years agoCorrect typo as spoted in a comment in online doc
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

11 years agoCorrect typo as spoted in a comment in online doc
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

11 years agoCorrect typo as spoted in a comment in online doc
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

11 years agoCorrect typo as spoted in a comment in online doc
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

11 years agoUpdates.
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

11 years agopropose CO= fix/feature for 2.2. PR 56014
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

11 years ago2.2 cannot set a session lifetime if any later fields are set,
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

11 years agoxforms
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

11 years agoMerge r1586437 from trunk:
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

11 years agopropose thunderin herd protection backport
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

11 years agoAppologies for being distracted and delayed release, on to Announcement...
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

11 years agoUpdates.
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

11 years ago* We are now at 2.2.28
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

11 years agoAnd we are on to 2.2.28
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

11 years agoPreparing to tag 2.2.27
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

11 years agoUser-facing CHANGES
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

11 years ago* Update transformation
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

11 years agoMerge r1575400 from trunk:
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

11 years ago* This one is backported
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

11 years agoMerge r1572543 from trunk:
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

11 years agoMerge r1553204, r1555240, r1572198 from trunk:
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

11 years agoMerge r1493330, r1504276, r1552227, r1551714, r1490994, r1172732 from trunk:
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

11 years agoMerge r1524192, r1524770, r1527925 from trunk:
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

11 years ago* Remove mergeinfo from single files / directories. We track merging at the root.
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

11 years agoMerge r1556428 from trunk:
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

11 years agoSNI reuse checks backport proposal with MMN bump.
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