]> granicus.if.org Git - apache/log
apache
7 years agoPromote.
Rainer Jung [Sun, 15 Oct 2017 11:32:43 +0000 (11:32 +0000)]
Promote.

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

7 years agoVote, comment.
Rainer Jung [Sun, 15 Oct 2017 11:31:58 +0000 (11:31 +0000)]
Vote, comment.

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

7 years agoand promote w/ 3 +1s
Jim Jagielski [Fri, 13 Oct 2017 13:53:53 +0000 (13:53 +0000)]
and promote w/ 3 +1s

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

7 years ago2 votes on backport proposals2 votes on backport proposals
Jim Jagielski [Fri, 13 Oct 2017 13:53:11 +0000 (13:53 +0000)]
2 votes on backport proposals2 votes on backport proposals

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

7 years agoRevoke SHOWSTOPPER status. EAGAIN, retry, continue...
William A. Rowe Jr [Fri, 13 Oct 2017 12:00:42 +0000 (12:00 +0000)]
Revoke SHOWSTOPPER status. EAGAIN, retry, continue...

Same committer shipped a release with one well known broken platform within
days of proposing a showstopper for a platform. This specific platform is not
even universally broken, but only for maintainer mode builds, and same has
upvoted a backport which can't compile in maintainer mode. Confused yet?

It might also be why this well-reasoned patch gathered little review, since
it was parked in a more obscure place?

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

7 years agoMerge r1808746, r1809028 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 08:42:57 +0000 (08:42 +0000)]
Merge r1808746, r1809028 from trunk:

mod_rewrite/core: avoid the 'Vary: Host' header

In PR 58231 is was brought up that httpd adds the
Vary: Host header whenever a condition is set to true
in mod_rewrite or in an <If> block.

The https://tools.ietf.org/html/rfc7231#section-7.1.4
section seems to disallow this use case:

"The "Vary" header field in a response describes "
"what parts of a request message, "
"aside from the method, Host header field, [...]"

I had a chat with the folks in #traffic-server and
they don't see much point in having a Vary: Host header,
plus it was reported that Varnish doesn't like it very
much (namely it does not cache the response when
it sees the header, links of the report in the PR).

I don't see much value in this behavior of httpd so
I am inclined to remove this response header value,
but I'd be glad to get a more experienced opinion.

mod_rewrite,core: avoid Vary:Host (part 2)

This is a follow up of r1808746 after a chat
with Yann on dev@:

- the HTTP:Host variable suffers from the same problem
- the strcasecmp should be used to allow case-sensitive
  comparisons.
- in mod_rewrite is less cumbersome and more clean to just
  make the Host header check in lookup_header, so it will
  be automatically picked up by every part of the code
  that uses it. It shouldn't be a relevant overhead for
  mod_rewrite.

Submitted by: elukey
Reviewed by: elukey, ylavic, wrowe

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

7 years agoMerge r1804096, r1807238, r1809981, r1810088, r1810089 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 08:37:45 +0000 (08:37 +0000)]
Merge r1804096, r1807238, r1809981, r1810088, r1810089 from trunk:

bumping version, removing some unused code, fixes in base64url from mod_md

On the trunk:

  *) mod_http2: DoS flow control protection is less agressive as long as active tasks stay
     below worker capacity. Intended to fix problems with media streaming.

On the trunk:
mod_http2: v0.10.12, removed optimization for mutex handling in bucket beams that could lead to assertion failure in edge cases.

reverting r1807238 bc not addressing the issue https://github.com/icing/mod_h2/issues/120

mod_http2: non-dev 1.10.12 for backport

Submitted by: icing
Reviewed by: icing, steffenal, ylavic

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

7 years agoShift left by one.
Yann Ylavic [Fri, 13 Oct 2017 08:22:48 +0000 (08:22 +0000)]
Shift left by one.

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

7 years agoShow trunk commits.
Yann Ylavic [Fri, 13 Oct 2017 08:21:12 +0000 (08:21 +0000)]
Show trunk commits.

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

7 years agoPropose.
Yann Ylavic [Fri, 13 Oct 2017 08:03:21 +0000 (08:03 +0000)]
Propose.

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

7 years agoMerge r1805195, r1812004 from trunk:
Yann Ylavic [Fri, 13 Oct 2017 07:30:15 +0000 (07:30 +0000)]
Merge r1805195, r1812004 from trunk:

Update offsets

Entry for 2.4.28 regression (r1808855 missing r1805195).

Submitted by: jim, ylavic
Reviewed/backported by: ylavic (CTR per miss in the original merge)

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

7 years agoVote.
Yann Ylavic [Thu, 12 Oct 2017 20:17:10 +0000 (20:17 +0000)]
Vote.

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

7 years agoFriendly link.
Yann Ylavic [Thu, 12 Oct 2017 20:01:28 +0000 (20:01 +0000)]
Friendly link.

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

7 years agoUpdate proposal.
Yann Ylavic [Thu, 12 Oct 2017 19:46:52 +0000 (19:46 +0000)]
Update proposal.

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

7 years agoPropose.
Yann Ylavic [Thu, 12 Oct 2017 19:37:44 +0000 (19:37 +0000)]
Propose.

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

7 years agoFixed patch location in backport proposal.
Stefan Eissing [Thu, 12 Oct 2017 14:36:11 +0000 (14:36 +0000)]
Fixed patch location in backport proposal.

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

7 years agopatches now reside in ^/httpd/httpd/patches/2.4.x
Stefan Eissing [Thu, 12 Oct 2017 14:35:18 +0000 (14:35 +0000)]
patches now reside in ^/httpd/httpd/patches/2.4.x

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

7 years agoproposing new module flag backport
Stefan Eissing [Thu, 12 Oct 2017 09:45:35 +0000 (09:45 +0000)]
proposing new module flag backport

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

7 years agoNon-distribution directory for holding patches for backport proposals.
Stefan Eissing [Thu, 12 Oct 2017 09:39:37 +0000 (09:39 +0000)]
Non-distribution directory for holding patches for backport proposals.

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

7 years agoLowest hanging fruit; more challenging patches appear stalled at the moment
William A. Rowe Jr [Wed, 11 Oct 2017 15:59:08 +0000 (15:59 +0000)]
Lowest hanging fruit; more challenging patches appear stalled at the moment

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

7 years agoAdd the (hopefully) intended change for r1811799's proposal
Luca Toscano [Wed, 11 Oct 2017 08:03:57 +0000 (08:03 +0000)]
Add the (hopefully) intended change for r1811799's proposal

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

7 years agoPropose.
Joe Orton [Wed, 11 Oct 2017 07:55:00 +0000 (07:55 +0000)]
Propose.

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

7 years agoMerged*3.
Joe Orton [Tue, 10 Oct 2017 17:57:07 +0000 (17:57 +0000)]
Merged*3.

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

7 years agoMerge r1809209 from trunk:
Joe Orton [Tue, 10 Oct 2017 17:56:40 +0000 (17:56 +0000)]
Merge r1809209 from trunk:

Fix a segmentation fault if AuthzDBDQuery is not set.

PR: 61546
Submitted by: Lubos Uhliarik <luhliari redhat.com>
Reviewed by: jailletc36, ylavic, elukey

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

7 years agoMerge r1664565 from trunk:
Joe Orton [Tue, 10 Oct 2017 17:54:32 +0000 (17:54 +0000)]
Merge r1664565 from trunk:

*) mod_rewrite: Add support for starting External Rewriting Programs
   as non-root user on UNIX systems by specifying username and group name
   as third argument of RewriteMap directive.

Submitted by: jkaluza
Reviewed by: jorton, wrowe, ylavic

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

7 years agoMerge r1808230 from trunk:
Joe Orton [Tue, 10 Oct 2017 17:51:13 +0000 (17:51 +0000)]
Merge r1808230 from trunk:

* server/protocol.c (ap_content_length_filter): Rewrite the content
  length filter to avoid arbitrary memory consumption for streaming
  responses (e.g. large CGI script output).  Ensures C-L is still
  generated in common cases (static content, small CGI script output),
  but this DOES change behaviour and some responses will end up
  chunked rather than C-L computed.

PR: 61222
Submitted by: jorton, rpluem
Reviewed by: jorton, wrowe, ylavic

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

7 years agoMerge r1736186 from trunk:
Yann Ylavic [Tue, 10 Oct 2017 17:17:33 +0000 (17:17 +0000)]
Merge r1736186 from trunk:

mod_ssl: return non ambiguous value in ssl_callback_SessionTicket() for
encryption mode (we used to return 0, OpenSSL documents returning 1 instead).

Practically this does not change anything since OpenSSL will only check for
>= 0 return value (non error) for encryption mode (the other possible return
values are only relevant for decryption mode).

However the OpenSSL documentation for SSL_CTX_set_tlsext_ticket_key_cb()
states:
"
The return value of the cb function is used by OpenSSL to determine what
further processing will occur. The following return values have meaning:

2
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters. Additionally it indicates that the session
    ticket is in a renewal period and should be replaced. The OpenSSL library
    will call cb again with an enc argument of 1 to set the new ticket (see
    RFC5077 3.3 paragraph 2).

1
    This indicates that the ctx and hctx have been set and the session can
    continue on those parameters.

0
    This indicates that it was not possible to set/retrieve a session ticket
    and the SSL/TLS session will continue by by negotiating a set of
    cryptographic parameters or using the alternate SSL/TLS resumption
    mechanism, session ids.
    If called with enc equal to 0 the library will call the cb again to get a
    new set of parameters.

less than 0
    This indicates an error.
"

So 0 is not appropriate in our code, 1 is what we really want (and it won't
break if OpenSSL later changes its checks on the callback return value).

Reported/Proposed by: oknet on github, pull request #18.
Reviewed by: jorton, ylavic, wrowe
[Closes #18]

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

7 years agoVote, promote.
Yann Ylavic [Tue, 10 Oct 2017 17:05:49 +0000 (17:05 +0000)]
Vote, promote.

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

7 years agoUpvote, promote
William A. Rowe Jr [Tue, 10 Oct 2017 16:34:47 +0000 (16:34 +0000)]
Upvote, promote

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

7 years agoThis appears wrong... left a duplicate break line here when manually editing
William A. Rowe Jr [Tue, 10 Oct 2017 13:38:29 +0000 (13:38 +0000)]
This appears wrong... left a duplicate break line here when manually editing

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

7 years agoFix Release as well as Debug target, submitted by Ivan Zhakov
William A. Rowe Jr [Tue, 10 Oct 2017 12:46:13 +0000 (12:46 +0000)]
Fix Release as well as Debug target, submitted by Ivan Zhakov

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

7 years agoVote.
Yann Ylavic [Tue, 10 Oct 2017 11:56:53 +0000 (11:56 +0000)]
Vote.

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

7 years ago1*merged.
Joe Orton [Tue, 10 Oct 2017 11:25:56 +0000 (11:25 +0000)]
1*merged.

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

7 years agoMerge r1798785 from trunk:
Joe Orton [Tue, 10 Oct 2017 11:25:14 +0000 (11:25 +0000)]
Merge r1798785 from trunk:

Quiet spurious gcc warning in ap_parse_form_data ("'escaped_char[0]' may be
used uninitialized in this function").

Submitted by: ylavic
Reviewed by: jailletc36, ylavic, jorton

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

7 years agomod_ssl SessionTicket callback fixeruper.
Joe Orton [Tue, 10 Oct 2017 11:24:15 +0000 (11:24 +0000)]
mod_ssl SessionTicket callback fixeruper.

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

7 years agoMerge r1811570 from trunk:
Ruediger Pluem [Tue, 10 Oct 2017 06:18:06 +0000 (06:18 +0000)]
Merge r1811570 from trunk:

* Make it compatible with Python 3
Submitted by: rpluem

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

7 years agoMerge r1811569 from trunk:
Ruediger Pluem [Tue, 10 Oct 2017 05:53:35 +0000 (05:53 +0000)]
Merge r1811569 from trunk:

* The calculation of the sizes was flawed:
  The index tells us the size of the node in 4096 byte pages minus 1.
  Hence we need to multiply back with 4096 aka << 12 (plus adding the
  missing page).

Submitted by: rpluem

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

7 years agoMerge r1811540, r1811541 from trunk:
Ruediger Pluem [Tue, 10 Oct 2017 05:52:38 +0000 (05:52 +0000)]
Merge r1811540, r1811541 from trunk:

* It needs to be the dereferenced node

* Convert to int before using
Submitted by: rpluem

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

7 years agoRevert r1811557: This should have gone to trunk first
Ruediger Pluem [Mon, 9 Oct 2017 13:28:46 +0000 (13:28 +0000)]
Revert r1811557: This should have gone to trunk first

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

7 years ago* The calculation of the sizes was flawed:
Ruediger Pluem [Mon, 9 Oct 2017 12:16:00 +0000 (12:16 +0000)]
* The calculation of the sizes was flawed:
  The index tells us the size of the node in 4096 byte pages minus 1.
  Hence we need to multiply back with 4096 aka << 12 (plus adding the
  missing page).

Reverted in r1811568

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

7 years agoAdd two backport proposals.
Joe Orton [Mon, 9 Oct 2017 08:45:36 +0000 (08:45 +0000)]
Add two backport proposals.

wrowe's +1 for C-L filter rewrite per msgid <CACsi252gUT1n_mzgwUVathOwYbidDzET7bTXR_KycobyLBWKAQ@mail.gmail.com>

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

7 years agoRelease date
Jim Jagielski [Sun, 8 Oct 2017 13:24:18 +0000 (13:24 +0000)]
Release date

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

7 years agoMerge r1811192, r1811285 from trunk:
Ruediger Pluem [Fri, 6 Oct 2017 07:06:10 +0000 (07:06 +0000)]
Merge r1811192, r1811285 from trunk:

* Add dump_all_pools and dump_pool_and_childs.

  - dump_all_pools: Dump the whole pool hierarchy starting from apr_global_pool.
                    Requires an arbitrary pool as starting parameter.
  - dump_pool_and_childs: Dump the whole pool hierarchy starting from
                          the given pool.

  dump_pool_and_childs is written in Python using the GDB Python API
  as doing recursive stuff in standard GDB macros is very difficult.

* Take the pointer from Yann: s/childs/children/

Submitted by: rpluem

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

7 years agoMerge r1808671 from trunk:
Ruediger Pluem [Fri, 6 Oct 2017 07:04:34 +0000 (07:04 +0000)]
Merge r1808671 from trunk:

* Correctly dump pools that have no tag
Submitted by: rpluem

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

7 years agoMerge r1666617 from trunk:
Ruediger Pluem [Fri, 6 Oct 2017 07:03:16 +0000 (07:03 +0000)]
Merge r1666617 from trunk:

.gdbinit: Add dump_skiplist.
Submitted by: ylavic

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

7 years agoUpvote, although CTR would seem reasonable
William A. Rowe Jr [Thu, 5 Oct 2017 19:04:12 +0000 (19:04 +0000)]
Upvote, although CTR would seem reasonable

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

7 years agoadd missing transformations
André Malo [Thu, 5 Oct 2017 09:22:19 +0000 (09:22 +0000)]
add missing transformations

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

7 years agoNote that this seems clang specific
Jim Jagielski [Tue, 3 Oct 2017 12:54:28 +0000 (12:54 +0000)]
Note that this seems clang specific

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

7 years agoVote.
Yann Ylavic [Tue, 3 Oct 2017 08:40:13 +0000 (08:40 +0000)]
Vote.

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

7 years agoExpat, like PCRE before, is aquired and built independently as of apr 1.6
William A. Rowe Jr [Mon, 2 Oct 2017 19:57:56 +0000 (19:57 +0000)]
Expat, like PCRE before, is aquired and built independently as of apr 1.6

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

7 years agogit-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810568 13f79...
Jim Jagielski [Mon, 2 Oct 2017 18:12:40 +0000 (18:12 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810568 13f79535-47bb-0310-9956-ffa450edef68

7 years agoNote show-stopper: --enable-maintainer-mode is broken w/ Xcode 9
Jim Jagielski [Mon, 2 Oct 2017 15:42:24 +0000 (15:42 +0000)]
Note show-stopper: --enable-maintainer-mode is broken w/ Xcode 9

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

7 years agoNevermind, my merge missed r1810089 somehow...
Yann Ylavic [Sat, 30 Sep 2017 19:23:02 +0000 (19:23 +0000)]
Nevermind, my merge missed r1810089 somehow...

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

7 years agoVote, promote.
Yann Ylavic [Sat, 30 Sep 2017 19:13:22 +0000 (19:13 +0000)]
Vote, promote.

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

7 years agoVote + promote
Luca Toscano [Sat, 30 Sep 2017 11:26:48 +0000 (11:26 +0000)]
Vote + promote

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

7 years agoVote mod_http2 1.10.12
Steffen Land [Fri, 29 Sep 2017 17:23:46 +0000 (17:23 +0000)]
Vote mod_http2 1.10.12

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

7 years agoPropose
Luca Toscano [Fri, 29 Sep 2017 16:26:01 +0000 (16:26 +0000)]
Propose

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

7 years agofixed embarassing vi artefact
Stefan Eissing [Fri, 29 Sep 2017 16:15:28 +0000 (16:15 +0000)]
fixed embarassing vi artefact

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

7 years agoOn the 2.4.x branch:
Stefan Eissing [Fri, 29 Sep 2017 16:14:21 +0000 (16:14 +0000)]
On the 2.4.x branch:

mod_http2: propose backport to v1.10.12

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

7 years agoRFC8081, new font/ registry as pointed out by Steffen (backports r1810121)
William A. Rowe Jr [Fri, 29 Sep 2017 15:10:51 +0000 (15:10 +0000)]
RFC8081, new font/ registry as pointed out by Steffen (backports r1810121)

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

7 years agoRepair copy/paste error noted by Steffen
William A. Rowe Jr [Fri, 29 Sep 2017 14:42:34 +0000 (14:42 +0000)]
Repair copy/paste error noted by Steffen

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

7 years agoWe no longer bundle APR at all, I don't know that many of these
William A. Rowe Jr [Thu, 28 Sep 2017 17:30:27 +0000 (17:30 +0000)]
We no longer bundle APR at all, I don't know that many of these
licenses belong in *this* project repository.

But APR no longer bundles expat at all, making two of those
licenses very archaic - and note they did not reflect the current
LICENSE file contents of the component.

Opinions on leaving it up to repos/asf/apr/apr/trunk/LICENSE
to document other licenses on their project, since we simply are
a consumer of another component, and no longer bundle that?

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

7 years agoDuplicate mod_watchdog.h to include/
William A. Rowe Jr [Thu, 28 Sep 2017 17:17:42 +0000 (17:17 +0000)]
Duplicate mod_watchdog.h to include/

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

7 years agoVote.
Yann Ylavic [Thu, 28 Sep 2017 13:28:22 +0000 (13:28 +0000)]
Vote.

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

7 years agoThis source and build file are text
William A. Rowe Jr [Wed, 27 Sep 2017 19:52:32 +0000 (19:52 +0000)]
This source and build file are text

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

7 years agoThis file contains text
William A. Rowe Jr [Wed, 27 Sep 2017 19:50:00 +0000 (19:50 +0000)]
This file contains text

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

7 years agosvn:keywords = LastChangedRevision
André Malo [Wed, 27 Sep 2017 16:28:44 +0000 (16:28 +0000)]
svn:keywords = LastChangedRevision

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

7 years agosvn:eol-style = native
André Malo [Wed, 27 Sep 2017 16:26:19 +0000 (16:26 +0000)]
svn:eol-style = native

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

7 years agoupdate transformations
André Malo [Wed, 27 Sep 2017 15:57:47 +0000 (15:57 +0000)]
update transformations

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

7 years agoFix proposal in STATUS
Luca Toscano [Wed, 27 Sep 2017 05:59:34 +0000 (05:59 +0000)]
Fix proposal in STATUS

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

7 years agoPropose
Christophe Jaillet [Wed, 27 Sep 2017 05:56:08 +0000 (05:56 +0000)]
Propose

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

7 years agoPropose
Christophe Jaillet [Wed, 27 Sep 2017 05:49:08 +0000 (05:49 +0000)]
Propose

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

7 years agoAnd we are 2.4.29-dev
Jim Jagielski [Mon, 25 Sep 2017 12:05:46 +0000 (12:05 +0000)]
And we are 2.4.29-dev

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

7 years agoGet ready to tag 2.4.28
Jim Jagielski [Mon, 25 Sep 2017 12:04:03 +0000 (12:04 +0000)]
Get ready to tag 2.4.28

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

7 years agoDocs xforms
Jim Jagielski [Sun, 24 Sep 2017 13:16:16 +0000 (13:16 +0000)]
Docs xforms

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

7 years agoRebuild.
Lucien Gentis [Sat, 23 Sep 2017 16:13:35 +0000 (16:13 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sat, 23 Sep 2017 16:12:53 +0000 (16:12 +0000)]
XML update.

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

7 years agoMerge r1802875 from trunk:
Yann Ylavic [Fri, 22 Sep 2017 10:55:22 +0000 (10:55 +0000)]
Merge r1802875 from trunk:

event: Avoid possible blocking in the listener thread when shutting down
connections. PR 60956.

start_lingering_close_nonblocking() now puts connections in defer_linger_chain
which is emptied by any worker thread (all atomically) after its usual work,
hence any possibly blocking flush and lingering close run outside the listener.

The listener may create a dedicated worker if it fills defer_linger_chain or
while it's not empty, calling push2worker with a NULL cs.

The state machine in process_socket() is slighly modified to be able to enter
with CONN_STATE_LINGER directly w/o clogging_input_filters to interfer.

New abort_socket_nonblocking() allows to reset connections when nonblocking is
required and we can't do much about the connection anymore, nor we want the
system to linger on its own after close().

Many thanks to Stefan Priebe for his heavy testing on many event's changes!

Submitted by: ylavic
Reviewed by: ylavic, jim, icing

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

7 years agovote and promote
Stefan Eissing [Fri, 22 Sep 2017 08:38:29 +0000 (08:38 +0000)]
vote and promote

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

7 years agoevent changes test OK on 2.4
Jim Jagielski [Thu, 21 Sep 2017 10:13:41 +0000 (10:13 +0000)]
event changes test OK on 2.4

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

7 years agoPropose fix for PR 60956.
Yann Ylavic [Tue, 19 Sep 2017 16:57:53 +0000 (16:57 +0000)]
Propose fix for PR 60956.

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

7 years agonor corrections.--Cette ligne, et les suivantes ci-dessous, seront ignorées--
Lucien Gentis [Tue, 19 Sep 2017 16:48:11 +0000 (16:48 +0000)]
nor corrections.--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/caching.xml.fr

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

7 years agopropose T&R
Jim Jagielski [Tue, 19 Sep 2017 14:25:50 +0000 (14:25 +0000)]
propose T&R

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

7 years agoMerge r1808780 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:18:43 +0000 (10:18 +0000)]
Merge r1808780 from trunk:

mod_speling/PR 38923: don't embed Referer in link in error page.

Submitted by: niq
Reviewed by: niq, ylavic, elukey

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

7 years agoMerge r1805188, r1805190, r1805206, r1808723 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:17:40 +0000 (10:17 +0000)]
Merge r1805188, r1805190, r1805206, r1808723 from trunk:

loadfactor now decimal

Umm. This is C :)

Fix remaining lint from ms capability for hchecks.

format typo

Reviewed by: jim, humbedooh, ylavic

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

7 years agoMerge r1729235, r1730079, r1801665 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:15:00 +0000 (10:15 +0000)]
Merge r1729235, r1730079, r1801665 from trunk:

Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.

Use different variables to track normal
modules and MPMs during build.

Normal modules and MPMs follow different
rules in the config, e.g. we are only
allowed to have one active LoadModule
for an MPM in the config.

As a side effect, LoadModule for MPMs
will now come before LoadModule for
the normal modules.

Makefile.in: fix MPM_MODULES typo
Submitted by: rjung, jchampion
Reviewed by: jchampion, icing, ylavic

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

7 years agoMerge r1808008, r1808085 from trunk:
Jim Jagielski [Tue, 19 Sep 2017 10:14:01 +0000 (10:14 +0000)]
Merge r1808008, r1808085 from trunk:

htdigest: prevent buffer overflow when strings in lines are too long.

Reported by: Hanno Böck
PR: 61511

Update CHANGES after r1808008
Submitted by: elukey
Reviewed by: elukey, icing, ylavic

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

7 years agoVote + Promote
Luca Toscano [Tue, 19 Sep 2017 09:14:56 +0000 (09:14 +0000)]
Vote + Promote

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

7 years agoCVE-2017-9798 disclosed, amend CHANGES entry for
Yann Ylavic [Mon, 18 Sep 2017 21:54:15 +0000 (21:54 +0000)]
CVE-2017-9798 disclosed, amend CHANGES entry for
https://svn.apache.org/r1807754

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

7 years agoVote.
Yann Ylavic [Mon, 18 Sep 2017 21:43:49 +0000 (21:43 +0000)]
Vote.

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

7 years agopropose backport
Nick Kew [Mon, 18 Sep 2017 21:35:43 +0000 (21:35 +0000)]
propose backport

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

7 years agoComment.
Yann Ylavic [Mon, 18 Sep 2017 17:15:45 +0000 (17:15 +0000)]
Comment.

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

7 years agoVote, promote.
Yann Ylavic [Mon, 18 Sep 2017 16:55:13 +0000 (16:55 +0000)]
Vote, promote.

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

7 years agoNot really a blocker, I just saw too much weirdness with floats ;)
Yann Ylavic [Mon, 18 Sep 2017 16:40:44 +0000 (16:40 +0000)]
Not really a blocker, I just saw too much weirdness with floats ;)
Looks fine here though.

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

7 years agoit's an older code, but it checks out...
Daniel Gruno [Mon, 18 Sep 2017 15:02:58 +0000 (15:02 +0000)]
it's an older code, but it checks out...

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

7 years agolbfactr patch v2
Jim Jagielski [Mon, 18 Sep 2017 14:20:59 +0000 (14:20 +0000)]
lbfactr patch v2

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

7 years agoMerge r1801594 from trunk:
Jim Jagielski [Mon, 18 Sep 2017 13:05:46 +0000 (13:05 +0000)]
Merge r1801594 from trunk:

Add logic to read the Upgrade header and use it in the response.
Use we you are proxying to a server that has multiple upgrade on the same IP/Port.
PR 61142

Submitted by: jfclere
Reviewed by: jfclere, jim, covener

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

7 years agoprettify.js: update the js with the new Directives
Luca Toscano [Fri, 15 Sep 2017 12:23:53 +0000 (12:23 +0000)]
prettify.js: update the js with the new Directives

Replaced the old list with what currently found in
https://httpd.apache.org/docs/current/mod/directives.html

This should allow a better highlight of new directives
like the mod_http2's ones

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

7 years agovote
Stefan Eissing [Tue, 12 Sep 2017 08:37:54 +0000 (08:37 +0000)]
vote

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

7 years agoProposed backport of r1808008
Luca Toscano [Tue, 12 Sep 2017 08:18:06 +0000 (08:18 +0000)]
Proposed backport of r1808008

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