]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Stefan Eissing [Mon, 17 Oct 2016 16:11:12 +0000 (16:11 +0000)]
Merge of
1764243 ,
1765318 from trunk:
mod_http2/mod_proxy_http2: 100-continue implementation, PING checks on aged backend connections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1765327 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 15 Oct 2016 18:56:03 +0000 (18:56 +0000)]
I missed this in r1763229
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1765099 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Oct 2016 20:02:00 +0000 (20:02 +0000)]
add remoteip thing w/ two reports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764958 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Oct 2016 15:11:56 +0000 (15:11 +0000)]
propose PR58292 fix.
old patch I forgot to backport and don't remember
found by a new user on 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764930 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Oct 2016 14:35:11 +0000 (14:35 +0000)]
Merge of r1764255 from trunk:
mod_proxy_http2: resolving last 2 reported dup symbol clashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764256 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 11 Oct 2016 13:40:08 +0000 (13:40 +0000)]
Merge of r1764236 from trunk:
mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764238 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Oct 2016 12:18:35 +0000 (12:18 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764232 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 11 Oct 2016 12:18:17 +0000 (12:18 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764231 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Oct 2016 12:32:38 +0000 (12:32 +0000)]
Merge r1732228 from trunk:
correct type
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764078 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Oct 2016 12:32:17 +0000 (12:32 +0000)]
Merge r1762517 from trunk:
mod_proxy: log diagnostics during ProxyPass[Match]
To help out users when debugging ProxyPass and ProxyPassMatch, log all
match attempts (at trace2), as well as matches that are either
successful or explicitly disabled (at trace1).
Submitted by: jchampion
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764077 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 10 Oct 2016 12:24:47 +0000 (12:24 +0000)]
Merge r1759984, r1760018 from trunk:
mod_proxy_fcgi: handle the HTTP 412 use case
This is a follow up of http://svn.apache.org/r1752347;
ap_meet_conditions could return a 412 status that if not
handled causes subsequent bogus reads and wrong messages
logged (like AH01070). After a chat on dev@ the feedback
was to couple HTTP_NOT_MODIFIED with HTTP_PRECONDITION_FAILED,
but any other feedback is welcome.
Fix stupid mistake introduced in r1759984
Submitted by: elukey
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764075 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 10 Oct 2016 11:11:59 +0000 (11:11 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764059 13f79535 -47bb-0310-9956-
ffa450edef68
Evgeny Kotkov [Mon, 10 Oct 2016 10:16:44 +0000 (10:16 +0000)]
Propose the dav_send_one_response() fix for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764051 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sun, 9 Oct 2016 20:30:40 +0000 (20:30 +0000)]
Merge of r1764005 from trunk:
mod_http2: reverting int->apr_uint32_t changes from 1.7.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1764007 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Oct 2016 15:28:54 +0000 (15:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763908 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Oct 2016 15:28:13 +0000 (15:28 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763907 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 8 Oct 2016 10:22:13 +0000 (10:22 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763886 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 7 Oct 2016 22:20:36 +0000 (22:20 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763845 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 7 Oct 2016 13:35:44 +0000 (13:35 +0000)]
Fixed broken link in my proposal and updated its description
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763762 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Oct 2016 12:01:51 +0000 (12:01 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763752 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Oct 2016 11:59:24 +0000 (11:59 +0000)]
Merge r1763749 from trunk:
update link to TCP_DEFER_ACCEPT
per http://httpd.apache.org/docs/2.4/mod/core.html#comment_5866
kernel.org links here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763750 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 6 Oct 2016 15:39:42 +0000 (15:39 +0000)]
Merge of r1763613 from trunk:
mod_http2: fixes compilation error on 32bit systems when generating a slave connection id
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763614 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 5 Oct 2016 12:46:04 +0000 (12:46 +0000)]
Vote and proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763444 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 4 Oct 2016 09:02:33 +0000 (09:02 +0000)]
Merge of r1763246 from trunk:
mod_http2: fixing Windows build issues by replacing hook with own implemenation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763250 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 4 Oct 2016 05:04:50 +0000 (05:04 +0000)]
catch up to r1763163
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763229 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 3 Oct 2016 12:57:47 +0000 (12:57 +0000)]
Merge of
1761479 ,
1761548 ,
1762703 ,
1763158 from trunk
mod_http2: rewrite of how responses and trailers are transferred between
master and slave connection. Reduction of internal states for tasks
and streams, stability. Heuristic id generation for slave connections
to better keep promise of connection ids unique at given point int time.
Fix for mod_cgid interop in high load situtations.
Fix for handling of incoming trailers when no request body is sent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763163 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Oct 2016 14:16:03 +0000 (14:16 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763018 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Oct 2016 14:12:24 +0000 (14:12 +0000)]
xml update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1763016 13f79535 -47bb-0310-9956-
ffa450edef68