]> granicus.if.org Git - apache/log
apache
7 years agoremove BOM
André Malo [Sun, 27 Nov 2016 22:24:38 +0000 (22:24 +0000)]
remove BOM

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

7 years agouse consistent encoding between xml.fr files (utf-8)
André Malo [Sun, 27 Nov 2016 22:22:06 +0000 (22:22 +0000)]
use consistent encoding between xml.fr files (utf-8)

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

7 years agoRebuild.
Lucien Gentis [Sun, 27 Nov 2016 13:46:15 +0000 (13:46 +0000)]
Rebuild.

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

7 years agoUTF-8 encoding.
Lucien Gentis [Sun, 27 Nov 2016 13:45:20 +0000 (13:45 +0000)]
UTF-8 encoding.

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

7 years agoMerge of r1771001,1771015 from trunk:
Stefan Eissing [Wed, 23 Nov 2016 18:20:10 +0000 (18:20 +0000)]
Merge of r1771001,1771015 from trunk:

mod_http2: new directive H2EarlyHints

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

7 years agobackport prop
Jim Jagielski [Wed, 23 Nov 2016 16:57:20 +0000 (16:57 +0000)]
backport prop

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

7 years agoMerge of r1769596,1769600,1770395,1770998 from trunk
Stefan Eissing [Wed, 23 Nov 2016 16:32:59 +0000 (16:32 +0000)]
Merge of r1769596,1769600,1770395,1770998 from trunk

mod_http2: PUSH triggers only on GET
mod_proxy_http2: 1xx responses not forwarded unconditionally on HTTP/1.x connections

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

7 years agothanks, now in the branch
Eric Covener [Tue, 22 Nov 2016 14:33:15 +0000 (14:33 +0000)]
thanks, now in the branch

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

7 years agothese look like works in progress (??)
Jim Jagielski [Tue, 22 Nov 2016 13:45:32 +0000 (13:45 +0000)]
these look like works in progress (??)

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

7 years agoMerge r1756542 from trunk:
Jim Jagielski [Tue, 22 Nov 2016 13:42:51 +0000 (13:42 +0000)]
Merge r1756542 from trunk:

mod_ssl: Fix quick renegotiation (OptRenegotiaton) with no intermediate
in the client certificate chain.  PR 55786.

This is done by handling an empty cert chain as no/NULL chain.

Submitted by: ylavic
Reviewed/backported by: jim

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

7 years agopromote
Jim Jagielski [Tue, 22 Nov 2016 13:40:56 +0000 (13:40 +0000)]
promote

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

7 years agotests OK
Jim Jagielski [Tue, 22 Nov 2016 13:40:39 +0000 (13:40 +0000)]
tests OK

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

7 years agoHmmm....
Jim Jagielski [Tue, 22 Nov 2016 12:40:47 +0000 (12:40 +0000)]
Hmmm....

Was folded into Revision 1769595 ??

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

7 years agovotes
Jim Jagielski [Tue, 22 Nov 2016 12:24:37 +0000 (12:24 +0000)]
votes

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

7 years agocomment on proposal
Stefan Eissing [Tue, 22 Nov 2016 09:53:10 +0000 (09:53 +0000)]
comment on proposal

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

7 years agovote+promote
Stefan Fritsch [Mon, 21 Nov 2016 22:24:20 +0000 (22:24 +0000)]
vote+promote

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

7 years agonote docs commit in proposal
Stefan Fritsch [Mon, 21 Nov 2016 22:15:48 +0000 (22:15 +0000)]
note docs commit in proposal

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

7 years agoSplit proposal for PR 53555 into smaller chunks
Stefan Fritsch [Mon, 21 Nov 2016 21:47:16 +0000 (21:47 +0000)]
Split proposal for PR 53555 into smaller chunks

Replace jim's proposal into smaller chunks that are IMHO easier to review.

The end result is the same, except for the CHANGES entry and one comment that I
added to r1770752 vs. the Bugzilla patch and that was missing in jim's patch.

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

7 years agoAnother bit o' lint
Jim Jagielski [Mon, 21 Nov 2016 21:07:51 +0000 (21:07 +0000)]
Another bit o' lint

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

7 years agoAnd the final trunk related bit
Jim Jagielski [Mon, 21 Nov 2016 21:07:04 +0000 (21:07 +0000)]
And the final trunk related bit

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

7 years agoPropose backport,
Jim Jagielski [Mon, 21 Nov 2016 21:03:06 +0000 (21:03 +0000)]
Propose backport,

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

7 years agoMerge r1752331, r1752332, r1752333 from trunk:
Jim Jagielski [Mon, 21 Nov 2016 12:18:18 +0000 (12:18 +0000)]
Merge r1752331, r1752332, r1752333 from trunk:

CMake: use CMAKE_REQUIRED_INCLUDES to find APR macros

When using CMake with Visual Studio on Windows, invoking the
CHECK_SYMBOL_EXISTS macro with the full paths to the include files seems
to always result in failure.

Instead, use the documented CMAKE_REQUIRED_INCLUDES variable to set the
include directory, and pass only the headers' base names to
CHECK_SYMBOL_EXISTS.

CMake: use generator expressions to find output files

Multi-configuration generators, like Visual Studio, use a different
output directory (Debug, Release, etc.) for each configuration. To find
the output files reliably, switch to using generator expressions instead
of hardcoding the file paths for PDBs, export files, etc.

CMake: quote installation paths

Deal with installation paths with spaces in them (e.g. "C:\Program
Files") by quoting the arguments to perl and xcopy.
Submitted by: jchampion
Reviewed/backported by: jim

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

7 years agoMerge r1769332 from trunk:
Jim Jagielski [Mon, 21 Nov 2016 12:17:46 +0000 (12:17 +0000)]
Merge r1769332 from trunk:

ssl: clear the error queue before SSL_read/write/accept()

If other modules or libraries do not clear the OpenSSL error queue after
a failed operation, other code that relies on SSL_get_error() -- in
particular, code that deals with SSL_ERROR_WANT_READ/WRITE logic -- will
malfunction later on. To prevent this, explicitly clear the error queue
before calls like SSL_read/write/accept().

PR: 60223
Submitted by: Paul Spangler <paul.spangler ni.com>
Submitted by: jchampion
Reviewed/backported by: jim

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

7 years agoMerge r1698334 from trunk:
Jim Jagielski [Mon, 21 Nov 2016 12:17:13 +0000 (12:17 +0000)]
Merge r1698334 from trunk:

Avoid adding duplicate subequest filters, as they would not be stripped
properly during an ap_internal_fast_redirect.

Submitted by: covener
Reviewed/backported by: jim

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

7 years agoXML updates.
Lucien Gentis [Sun, 20 Nov 2016 13:36:35 +0000 (13:36 +0000)]
XML updates.

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

7 years agoXML updates.
Lucien Gentis [Sat, 19 Nov 2016 17:17:50 +0000 (17:17 +0000)]
XML updates.

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

7 years agoRebuild.
Lucien Gentis [Sat, 19 Nov 2016 16:24:35 +0000 (16:24 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 19 Nov 2016 16:23:49 +0000 (16:23 +0000)]
XML updates.

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

7 years agodocumentation rebuild
Luca Toscano [Thu, 17 Nov 2016 10:52:21 +0000 (10:52 +0000)]
documentation rebuild

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

7 years agoMerge r1769899 from trunk:
Luca Toscano [Thu, 17 Nov 2016 10:51:50 +0000 (10:51 +0000)]
Merge r1769899 from trunk:

Added a note in the mod_headers docs about Content-Type and setifempty

This note has been added as a follow up of a stack overflow post
(thanks to Michael Allan for the research):

http://stackoverflow.com/questions/29398123/apache-2-4-set-mime-type-of-file-without-extension

After a chat in #httpd-dev it seems that the issue boils down to how %{CONTENT_TYPE}
is evaluated in util_expr_eval.c (r->content_type) vs how setifempty is (only a check
of the response headers). This particular behavior might be a bug or feature,
but it is worth to alert our users.

Submitted by: elukey

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

7 years agoVote and promote
William A. Rowe Jr [Wed, 16 Nov 2016 17:24:11 +0000 (17:24 +0000)]
Vote and promote

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

7 years agoDocumentation rebuild
Luca Toscano [Tue, 15 Nov 2016 16:16:43 +0000 (16:16 +0000)]
Documentation rebuild

This commit also revert my last one about H2PushResource.
After a chat on #http-dev we decided to make it public since
it holds a Compatibility section.

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

7 years agoRevert introduction of H2PushResource on 2.4 docs
Luca Toscano [Tue, 15 Nov 2016 11:48:01 +0000 (11:48 +0000)]
Revert introduction of H2PushResource on 2.4 docs

The directive will be available only from 2.4.24 onwards,
reverting to avoid confusing users.

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

7 years agodocumentation rebuild
Luca Toscano [Tue, 15 Nov 2016 11:33:43 +0000 (11:33 +0000)]
documentation rebuild

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

7 years agoMerge r1769637 from trunk:
Luca Toscano [Tue, 15 Nov 2016 11:32:27 +0000 (11:32 +0000)]
Merge r1769637 from trunk:

Unified duplicate warning in mod_proxy ProxyPass documentation.

Also changed terminology to be in sync with:
https://httpd.apache.org/docs/current/mod/directive-dict.html#Context

It was confusing in my opinion to read that ProxyPass wasn't supported
for the <Directory> context (since "directory" semantic is already
overloaded).

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

7 years agoPromote one patch, propose one historically tangled patch
William A. Rowe Jr [Mon, 14 Nov 2016 19:02:29 +0000 (19:02 +0000)]
Promote one patch, propose one historically tangled patch

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

7 years agoMerge r1733538 from trunk (follow up to 2.4.21's r1746997):
Yann Ylavic [Mon, 14 Nov 2016 12:09:48 +0000 (12:09 +0000)]
Merge r1733538 from trunk (follow up to 2.4.21's r1746997):

ab: follow up to r1733537: CHANGES entry.

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

7 years agoMerge r1769593 from trunk (mergeinfo for r1769601):
Yann Ylavic [Mon, 14 Nov 2016 12:02:10 +0000 (12:02 +0000)]
Merge r1769593 from trunk (mergeinfo for r1769601):

Updated changelog with the last change of mod_proxy_fcgi

r1759984, r1760018 and r1752347 are all changes related
to a bug fixed for mod_proxy_fcgi.

Submitted by: elukey

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

7 years agoMerge r1764046 from trunk (mergeinfo for r1769599):
Yann Ylavic [Mon, 14 Nov 2016 12:00:39 +0000 (12:00 +0000)]
Merge r1764046 from trunk (mergeinfo for r1769599):

Following up on r1764040, add the CHANGES entry.

Submitted by: kotkov

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

7 years agoMerge of r1769600 from trunk:
Stefan Eissing [Mon, 14 Nov 2016 11:45:56 +0000 (11:45 +0000)]
Merge of r1769600 from trunk:

mod_http2: fixes for compiler warnings

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

7 years agoMerge r1769593 from trunk: follow up to r1764075: update CHANGES entry.
Yann Ylavic [Mon, 14 Nov 2016 11:40:01 +0000 (11:40 +0000)]
Merge r1769593 from trunk: follow up to r1764075: update CHANGES entry.

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

7 years agoMerge r1764046 from trunk: follow up to r1766683: CHANGES entry.
Yann Ylavic [Mon, 14 Nov 2016 11:36:35 +0000 (11:36 +0000)]
Merge r1764046 from trunk: follow up to r1766683: CHANGES entry.

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

7 years agoMerge of r1767936,1768160,1769192,1769550 from trunk:
Stefan Eissing [Mon, 14 Nov 2016 11:15:08 +0000 (11:15 +0000)]
Merge of r1767936,1768160,1769192,1769550 from trunk:

mod_http2: new directive 'H2PushResource' to enable early pushes before
     processing of the main request starts. Resources are announced to the
     client in Link headers on a 103 early hint response.
     All responses with status code <400 are inspected for Link header and
     trigger pushes accordingly. 304 still does prevent pushes.
     'H2PushResource' can mark resources as 'critical' which gives them higher
     priority than the main resource. This leads to preferred scheduling for
     processing and, when content is available, will send it first. 'critical'
     is also recognized on Link headers.

mod_proxy_http2: uris in Link headers are now mapped back to a suitable
     local url when available. Relative uris with an absolute path are mapped
     as well. This makes reverse proxy mapping available for resources
     announced in this header.
     With 103 interim responses being forwarded to the main client connection,
     this effectively allows early pushing of resources by a reverse proxied
     backend server.
     adding support for newly proposed 103 status code.

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

7 years agoRebuild.
Lucien Gentis [Sun, 13 Nov 2016 13:36:44 +0000 (13:36 +0000)]
Rebuild.

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

7 years agoXML update.
Lucien Gentis [Sun, 13 Nov 2016 13:35:54 +0000 (13:35 +0000)]
XML update.

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

7 years ago* Vote
Ruediger Pluem [Fri, 11 Nov 2016 20:43:13 +0000 (20:43 +0000)]
* Vote

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

7 years agoPropose patch for PR60223
Jacob Champion [Fri, 11 Nov 2016 19:49:36 +0000 (19:49 +0000)]
Propose patch for PR60223

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

7 years agoUTF-8 character encoding.
Lucien Gentis [Fri, 11 Nov 2016 17:01:54 +0000 (17:01 +0000)]
UTF-8 character encoding.

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

7 years agoRebuild.
Lucien Gentis [Fri, 11 Nov 2016 15:34:34 +0000 (15:34 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Fri, 11 Nov 2016 15:33:35 +0000 (15:33 +0000)]
XML updates.

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

7 years agoComment, promote
Jacob Champion [Thu, 10 Nov 2016 21:32:43 +0000 (21:32 +0000)]
Comment, promote

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

7 years agoPropose
Jacob Champion [Thu, 10 Nov 2016 21:02:10 +0000 (21:02 +0000)]
Propose

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

7 years agoxform
Eric Covener [Wed, 9 Nov 2016 13:30:43 +0000 (13:30 +0000)]
xform

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

7 years agoduplicate "the". Fold line
Eric Covener [Wed, 9 Nov 2016 13:29:55 +0000 (13:29 +0000)]
duplicate "the". Fold line

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

7 years agomod_socache_memcache mod_status hook data
Jim Jagielski [Mon, 7 Nov 2016 14:37:17 +0000 (14:37 +0000)]
mod_socache_memcache mod_status hook data

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

7 years agoMerge r1739201 from trunk:
Jim Jagielski [Fri, 4 Nov 2016 19:04:05 +0000 (19:04 +0000)]
Merge r1739201 from trunk:

http: Respond with "408 Request Timeout" when a timeout occurs while
reading the request body.

Submitted by: ylavic
Reviewed/backported by: jim

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

7 years agoMerge r1766160 from trunk:
Jim Jagielski [Fri, 4 Nov 2016 19:02:44 +0000 (19:02 +0000)]
Merge r1766160 from trunk:

mpm_unix: Apache fails to start if previously crashed then restarted with
the same PID (e.g. in container).  PR 60261.

Proposed by: Val <valentin.bremond gmail.com>
Reviewed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

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

7 years agopromote
Jim Jagielski [Fri, 4 Nov 2016 19:01:41 +0000 (19:01 +0000)]
promote

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

7 years agoSome votes
Jim Jagielski [Fri, 4 Nov 2016 19:01:19 +0000 (19:01 +0000)]
Some votes

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

7 years agoRebuild
Luis Gil [Thu, 3 Nov 2016 11:09:05 +0000 (11:09 +0000)]
Rebuild

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

7 years agoMerge of r1767803 from trunk.
Stefan Eissing [Thu, 3 Nov 2016 00:02:30 +0000 (00:02 +0000)]
Merge of r1767803 from trunk.

mod_http2: fix for beam double cleanup crashes introduced in 1.7.7

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

7 years agovote/promote
Eric Covener [Wed, 2 Nov 2016 12:18:29 +0000 (12:18 +0000)]
vote/promote

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

7 years agore-propose PR58292 with the revision that was sitting in trunk.
Eric Covener [Wed, 2 Nov 2016 12:14:29 +0000 (12:14 +0000)]
re-propose PR58292 with the revision that was sitting in trunk.

e--This line, and those below, will be ignored--

M    STATUS

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

7 years agowork in progress
Jim Jagielski [Wed, 2 Nov 2016 12:08:02 +0000 (12:08 +0000)]
work in progress

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

7 years agoRevert 1767482
Jim Jagielski [Wed, 2 Nov 2016 12:06:01 +0000 (12:06 +0000)]
Revert 1767482

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

7 years agokill bad backport
Eric Covener [Wed, 2 Nov 2016 12:01:39 +0000 (12:01 +0000)]
kill bad backport

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

7 years agorevert 1767482 backport
Eric Covener [Wed, 2 Nov 2016 12:01:23 +0000 (12:01 +0000)]
revert 1767482 backport

cleanup next

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

7 years agoMerge of r1766857,1767128,1767180,1767181,1767553 from trunk
Stefan Eissing [Tue, 1 Nov 2016 20:24:52 +0000 (20:24 +0000)]
Merge of r1766857,1767128,1767180,1767181,1767553 from trunk

mod_http2/mod_proxy_http2 improvments as in CHANGES

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

8 years agoMerge r1688399 from trunk:
Jim Jagielski [Tue, 1 Nov 2016 11:55:34 +0000 (11:55 +0000)]
Merge r1688399 from trunk:

mod_remoteip: Use r->useragent_addr as the root trusted address for verifying.

This fixes issue resulting in setting of bad useragent_ip when internal
redirection has been generated as response to the request (typically as
result of "ErrorDocument 40x").

In this case, the original request has been handled by mod_remoteip and its
useragent_ip has been changed properly, but when internal redirection
to ErrorDocument has been generated later, the mod_remoteip's handler has been
executed again with *the same* c->client_addr as in the original request. If
c->client_addr IP is trusted, this results in bad useragent_ip being set.

When using r->useragent_addr as the root trusted address instead of
c->client_addr, the internal redirection uses the first non-trusted
IP in this particular case, so it won't change the r->useragent_ip during
the internal redirection to ErrorDocument.

Submitted by: jkaluza
Reviewed/backported by: jim

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

8 years agoMerge r1698239 from trunk:
Jim Jagielski [Tue, 1 Nov 2016 11:53:57 +0000 (11:53 +0000)]
Merge r1698239 from trunk:
Submitted by: covener
Reviewed/backported by: jim

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

8 years agopromotes
Jim Jagielski [Tue, 1 Nov 2016 11:50:06 +0000 (11:50 +0000)]
promotes

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

8 years agovotes
Jim Jagielski [Tue, 1 Nov 2016 11:49:39 +0000 (11:49 +0000)]
votes

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

8 years agoPropose.
Yann Ylavic [Fri, 28 Oct 2016 00:03:50 +0000 (00:03 +0000)]
Propose.

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

8 years agoMerge r1728804 from trunk:
Yann Ylavic [Thu, 27 Oct 2016 22:50:55 +0000 (22:50 +0000)]
Merge r1728804 from trunk:

Add mod_proxy_hcheck to the Netware build
system.

Contributed by NormW.

Submitted by: rjung

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

8 years agoAdd missing mod_proxy exports for NetWare.
Yann Ylavic [Thu, 27 Oct 2016 22:49:33 +0000 (22:49 +0000)]
Add missing mod_proxy exports for NetWare.

Proposed by Norm.

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

8 years agoMerge of r1765328,1766424,1766691,1766851 from trunk:
Stefan Eissing [Thu, 27 Oct 2016 16:53:58 +0000 (16:53 +0000)]
Merge of r1765328,1766424,1766691,1766851 from trunk:

mod_http2: v1.7.7, connection shutdown revisited, AP_DEBUG_ASSERT transformed to real asserts

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

8 years agoMerge r1764040 from trunk:
Jim Jagielski [Wed, 26 Oct 2016 13:44:36 +0000 (13:44 +0000)]
Merge r1764040 from trunk:

mod_dav: Fix a potential cause of unbounded memory usage or incorrect
behavior in a routine that sends <DAV:response>'s to the output filters.

The dav_send_one_response() function accepts the current head of the output
filter list as an argument, but the actual head can change between calls to
ap_pass_brigade().  This can happen with self-removing filters, e.g., with
the filter from mod_headers or mod_deflate.  Consequently, executing an
already removed filter can either cause unwanted memory usage or incorrect
behavior.

This patch changes the signature of the existing mod_dav's public API,
dav_send_one_response(), because this API is not yet a part of any 2.4.x
release.

* modules/dav/main/mod_dav.c
  (dav_send_one_response): Accept a request_rec instead of an ap_filter_t.
   Write the response to r->output_filters.
  (dav_send_multistatus, dav_stream_response): Update these calling sites
   of dav_send_one_response().

* modules/dav/main/mod_dav.h
  (dav_send_one_response): Adjust definition.

Submitted by: kotkov
Reviewed/backported by: jim

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

8 years agoFix typo and encoding.
Yann Ylavic [Mon, 24 Oct 2016 21:05:07 +0000 (21:05 +0000)]
Fix typo and encoding.

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

8 years agoAP_MAYBE_UNUSED is useful right now.
Yann Ylavic [Mon, 24 Oct 2016 21:03:30 +0000 (21:03 +0000)]
AP_MAYBE_UNUSED is useful right now.

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

8 years agoFollow up to r1766373: merge infos.
Yann Ylavic [Mon, 24 Oct 2016 11:21:19 +0000 (11:21 +0000)]
Follow up to r1766373: merge infos.

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

8 years agoupdate after backport
Stefan Eissing [Mon, 24 Oct 2016 10:07:16 +0000 (10:07 +0000)]
update after backport

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

8 years agoMerge of r1750392,r1750412,r1750416,r1750474,r1750494,r1750508 from trunk:
Stefan Eissing [Mon, 24 Oct 2016 10:06:41 +0000 (10:06 +0000)]
Merge of r1750392,r1750412,r1750416,r1750474,r1750494,r1750508 from trunk:

mod_proxy_{http,ajp,fcgi}: don't reuse backend connections with data
     available before the request is sent.  PR 57832.

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

8 years agovote and promote
Stefan Eissing [Mon, 24 Oct 2016 10:04:58 +0000 (10:04 +0000)]
vote and promote

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

8 years agoMerge of r1766308 from trunk:
Stefan Eissing [Sun, 23 Oct 2016 18:42:35 +0000 (18:42 +0000)]
Merge of r1766308 from trunk:

mod_http2: fixed potential crash in beam memory handling introduced in 1.7.x changes

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

8 years agoRebuild.
Lucien Gentis [Sat, 22 Oct 2016 16:34:16 +0000 (16:34 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sat, 22 Oct 2016 16:33:38 +0000 (16:33 +0000)]
XML updates.

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

8 years agoPropose.
Yann Ylavic [Fri, 21 Oct 2016 21:47:46 +0000 (21:47 +0000)]
Propose.

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

8 years agoVotes.
Yann Ylavic [Fri, 21 Oct 2016 21:35:40 +0000 (21:35 +0000)]
Votes.

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

8 years agoVote (adding relevent entries part of the backport proposal).
Yann Ylavic [Fri, 21 Oct 2016 21:26:27 +0000 (21:26 +0000)]
Vote (adding relevent entries part of the backport proposal).

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

8 years agoMerge r1766129 from trunk:
Yann Ylavic [Fri, 21 Oct 2016 21:07:43 +0000 (21:07 +0000)]
Merge r1766129 from trunk:

Fix -Wunused-but-set-variable warnings.

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

8 years agoxforms
Jim Jagielski [Fri, 21 Oct 2016 18:56:14 +0000 (18:56 +0000)]
xforms

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

8 years agoMerge r1766103 from trunk:
Jim Jagielski [Fri, 21 Oct 2016 18:55:55 +0000 (18:55 +0000)]
Merge r1766103 from trunk:

Fine tune description

Reviewed/backported by: jim

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

8 years agoMerge r1766103 from trunk:
Jim Jagielski [Fri, 21 Oct 2016 18:51:06 +0000 (18:51 +0000)]
Merge r1766103 from trunk:

Fine tune description

Reviewed/backported by: jim

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

8 years agoxforms
Jim Jagielski [Fri, 21 Oct 2016 18:41:34 +0000 (18:41 +0000)]
xforms

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

8 years agoMerge r1766097 from trunk:
Jim Jagielski [Fri, 21 Oct 2016 18:34:28 +0000 (18:34 +0000)]
Merge r1766097 from trunk:

Some caching info

Reviewed/backported by: jim

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

8 years agoUpdate cache proposal
Jim Jagielski [Fri, 21 Oct 2016 17:38:08 +0000 (17:38 +0000)]
Update cache proposal

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

8 years agosvn:keywords = LastChangedRevision
André Malo [Thu, 20 Oct 2016 08:39:23 +0000 (08:39 +0000)]
svn:keywords = LastChangedRevision

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

8 years agoupdate transformation
André Malo [Thu, 20 Oct 2016 08:34:32 +0000 (08:34 +0000)]
update transformation

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

8 years agoMerge of r1765420 from trunk:
Stefan Eissing [Tue, 18 Oct 2016 12:06:27 +0000 (12:06 +0000)]
Merge of r1765420 from trunk:

mod_http2: netware build add new symbol used from nghttp2

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

8 years agoMerge r1765357 from trunk:
Jacob Champion [Mon, 17 Oct 2016 20:15:35 +0000 (20:15 +0000)]
Merge r1765357 from trunk:

docs: add "threat model" warning to ProxyHTMLMeta

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