]>
granicus.if.org Git - apache/log
Lucien Gentis [Sun, 29 Jan 2017 15:48:17 +0000 (15:48 +0000)]
Bad meta file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780813 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Jan 2017 16:35:26 +0000 (16:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780718 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Jan 2017 16:34:40 +0000 (16:34 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780717 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 27 Jan 2017 17:32:48 +0000 (17:32 +0000)]
On the 2.4.x branch:
Merge of r1779979,
1780159 ,
1780576 ,
1780596 from trunk:
M modules/http2/h2_bucket_beam.c
fix for possible duplicate free of send/recv pools
M modules/http2/h2_from_h1.c
suppress generating responses on aborted slave connections
M modules/http2/h2_session.c
regression: stream ongoing streams on graceful shutdown to the end
M modules/http2/h2_version.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780597 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 26 Jan 2017 10:37:18 +0000 (10:37 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780359 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Thu, 26 Jan 2017 10:36:49 +0000 (10:36 +0000)]
Add HTTP/2 howto link to index and sitemap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780358 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 25 Jan 2017 15:29:02 +0000 (15:29 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780219 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 25 Jan 2017 15:27:20 +0000 (15:27 +0000)]
Correct some typos across the documentation.
This commit was made thanks to the tool and PR
created by Lajos Veres (vlajos) on github.
PR: https://github.com/apache/httpd/pull/6
Tool: https://github.com/vlajos/misspell_fixer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780218 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 24 Jan 2017 10:03:09 +0000 (10:03 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780047 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 24 Jan 2017 09:58:47 +0000 (09:58 +0000)]
Merge r1779927 from trunk:
Reworked and added examples to the HTTPProtocolOptions doc
On #httpd-dev a user gave us some hints about what kind of
things would have been great to see in the HTTPProtocolOptions
directive's documentation, so I tried to apply them all.
I also added some examples taken from http_strict.t and tested
a bit. I didn't follow completely the complete change-set of
the HTTPProtocolOptions directive, so please review the change
and let me know if anything is wrong or missing.
Submitted by: elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780045 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 24 Jan 2017 09:56:19 +0000 (09:56 +0000)]
Merge r1779578, r1779609 from trunk:
Added more details to mod-proxy-http2's doc
Reworked mod-proxy-http2's documentation after Stefan's suggestions
Submitted by: elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1780044 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 23 Jan 2017 20:24:41 +0000 (20:24 +0000)]
On the 2.4.x branch:
Merge r1779743,
1779896 ,
1779972 from trunk.
mod_http2: fixes PR60599, sending proper response for conditional requests
answered by mod_cache. [Jeff Wheelhouse, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779975 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 21 Jan 2017 15:48:17 +0000 (15:48 +0000)]
On the 2.4.x branch: merge r1778630,
1779459 ,
1779525 ,
1779528 ,
1779738 from trunk
*) mod_http2: rework of stream resource cleanup to avoid a crash in a close
of a lingering connection. Prohibit special file bucket beaming for
shared buckets. Files sent in stream output now use the stream pool
as read buffer, reducing memory footprint of connections.
[Yann Ylavic, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779742 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 21 Jan 2017 14:44:05 +0000 (14:44 +0000)]
Should be in next release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779736 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Jan 2017 14:35:34 +0000 (14:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779732 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Jan 2017 14:34:35 +0000 (14:34 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779731 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 19 Jan 2017 14:50:11 +0000 (14:50 +0000)]
As per http://httpd.apache.org/docs/2.4/programs/httpd.html#comment_6187
the -R option has been gone for ages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779470 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 16 Jan 2017 18:54:29 +0000 (18:54 +0000)]
mod_brotli backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779079 13f79535 -47bb-0310-9956-
ffa450edef68
Jacob Champion [Mon, 16 Jan 2017 17:09:01 +0000 (17:09 +0000)]
Add showstopper for 2.4.x PHP-FPM breakage
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1779067 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 15 Jan 2017 13:48:05 +0000 (13:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778920 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 15 Jan 2017 13:47:20 +0000 (13:47 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778919 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 15 Jan 2017 12:40:17 +0000 (12:40 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778909 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2017 17:46:04 +0000 (17:46 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778809 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Jan 2017 17:45:06 +0000 (17:45 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778808 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 13 Jan 2017 16:32:57 +0000 (16:32 +0000)]
On the 2.4.x branch: merge of r1701609-
1705681 from trunk.
*) mod_http2: streaming of request output now reacts timely to data
from other streams becoming available. Same for new incoming requests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778629 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 11 Jan 2017 18:05:48 +0000 (18:05 +0000)]
Update w/ name change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778332 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 11 Jan 2017 17:22:26 +0000 (17:22 +0000)]
Backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778325 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2017 21:17:08 +0000 (21:17 +0000)]
Merge r1777460, r1777672 from trunk:
http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).
http: follow up to r1777460.
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.
Submitted by: ylavic
Reviewed by: ylavic, covener, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778052 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2017 21:16:20 +0000 (21:16 +0000)]
*) mod_auth_digest: Reduce severity from NOTICE to DEBUG this
once-per-restart msg (I guess the concern was that the RNG
could block after this message)
AH01757: generating secret for digest authentication ...
trunk patch: This was fixed in trunk as a trivial part of http://svn.apache.org/r1492395
2.4.x patch: Just change the loglevel to DEBUG.
+1: covener, jim, wrowe
Submitted by: covener
Reviewed by: covener, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778051 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2017 21:13:46 +0000 (21:13 +0000)]
Merge r1775487 from trunk:
fix crash in util_fcgi.c
*) mod_proxy_fcgi, mod_fcgid: Fix crashes in ap_fcgi_encoded_env_len() when
modules add empty environment variables to the request. PR60275.
[<alex2grad AT gmail.com>]
Submitted By: <alex2grad AT gmail.com>]
Committed By: covener
Submitted by: covener
Reviewed by: covener, jim, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778050 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 Jan 2017 16:23:51 +0000 (16:23 +0000)]
** NOTE: the vendor states "This mitigation has been assigned the identifier
CVE-2016-5387"; in other words, this is not a CVE ID for a vulnerability. **
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778007 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 9 Jan 2017 16:12:53 +0000 (16:12 +0000)]
Upvote and promote 3 patches, note one being-worked, as yet unworkable backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1778004 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2017 14:47:40 +0000 (14:47 +0000)]
Merge r1775775 from trunk:
mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).
Submitted by: ylavic
Reviewed by: ylavic, jim, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777975 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Jan 2017 17:13:35 +0000 (17:13 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777893 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Jan 2017 17:12:25 +0000 (17:12 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777892 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Jan 2017 17:45:20 +0000 (17:45 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777831 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Jan 2017 17:44:24 +0000 (17:44 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777830 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 6 Jan 2017 21:32:59 +0000 (21:32 +0000)]
Fix some style issue in mod_lua (which is not under RTC)
(r1772490 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777719 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 6 Jan 2017 18:47:25 +0000 (18:47 +0000)]
Synch with trunk - remove trailing spaces
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777687 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Jan 2017 18:20:20 +0000 (18:20 +0000)]
some easy votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777681 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 6 Jan 2017 18:17:35 +0000 (18:17 +0000)]
Update, per dev@ review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777680 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 6 Jan 2017 08:28:00 +0000 (08:28 +0000)]
Fix typo in comment
(r1739569 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777536 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Jan 2017 23:11:25 +0000 (23:11 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777522 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Jan 2017 17:00:24 +0000 (17:00 +0000)]
On the 2.4.x branch: merge of r1776738,
1777160 ,
1777324 from trunk
backport of latest mod_http2 related changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777344 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 3 Jan 2017 15:31:52 +0000 (15:31 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777144 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 3 Jan 2017 15:27:47 +0000 (15:27 +0000)]
Add cross references
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777141 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Jan 2017 13:22:36 +0000 (13:22 +0000)]
Oh yeah
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777120 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2017 13:15:09 +0000 (13:15 +0000)]
note 2.4.24 was not released in CHANGES too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777116 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 3 Jan 2017 04:29:43 +0000 (04:29 +0000)]
Fix a typo spotted in an old comment + synch with trunk (trailing space)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777060 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 2 Jan 2017 21:16:15 +0000 (21:16 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777022 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 2 Jan 2017 20:14:12 +0000 (20:14 +0000)]
Fix a typo in an example (missing ")
The typo is already fixed in trunk
+ synch a bit with trunk (tab vs space, trailing space)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1777005 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 2 Jan 2017 18:03:15 +0000 (18:03 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776972 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 2 Jan 2017 16:13:18 +0000 (16:13 +0000)]
Happy New Year 2017
Backport of r1776956 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776957 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 31 Dec 2016 13:42:52 +0000 (13:42 +0000)]
Update proposal with reference to trunk commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776741 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 31 Dec 2016 13:25:05 +0000 (13:25 +0000)]
On the 2.4.x branch, merge of r1775946,
1776735 from trunk:
mod_http2: adding support for MergeTrailers directive.
mod_http2: limiting DATA frame sizes by TLS record sizes in use on the
connection. Flushing outgoing frames earlier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776737 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 31 Dec 2016 09:31:10 +0000 (09:31 +0000)]
Documentation rebuild - part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776713 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 31 Dec 2016 09:28:16 +0000 (09:28 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776712 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 31 Dec 2016 09:27:48 +0000 (09:27 +0000)]
Fixed some doc typos detected by a user.
Sébastien Santoro (dereckson AT espace-win.org)
sent a bug report about one typo in core.xml
and I executed the aspell tool on the whole file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776711 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 31 Dec 2016 00:13:45 +0000 (00:13 +0000)]
propose PR58856 fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776665 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 31 Dec 2016 00:06:56 +0000 (00:06 +0000)]
Looks like this entry was added to the wrong section
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776663 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 30 Dec 2016 19:28:26 +0000 (19:28 +0000)]
Note additional trunk patch for RemoteIPProxyProtocol
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776629 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 30 Dec 2016 19:13:44 +0000 (19:13 +0000)]
Update reference to patch to match shorter name in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776627 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 30 Dec 2016 16:23:44 +0000 (16:23 +0000)]
Better formatting of proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776601 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 30 Dec 2016 16:22:11 +0000 (16:22 +0000)]
Propose PROXY protocol support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776600 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 30 Dec 2016 15:04:08 +0000 (15:04 +0000)]
Propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776587 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Dec 2016 13:17:31 +0000 (13:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776123 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Dec 2016 13:14:44 +0000 (13:14 +0000)]
Fix translation.
Because of the missing upper case, "La documentation de cette directive n'a pas encore t traduite. Veuillez vous reporter la version en langue anglaise." is displayed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776120 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Dec 2016 08:41:59 +0000 (08:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776093 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Dec 2016 08:39:41 +0000 (08:39 +0000)]
Fix old comment from Martijn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1776091 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Sat, 24 Dec 2016 10:04:19 +0000 (10:04 +0000)]
On the 2.4.x branch:
mod_http2: removing debug logs leftover in previous commit
* modules/http2/h2_bucket_beam.c
removed log warnings from debug session
Modified:
httpd/httpd/trunk/modules/http2/h2_bucket_beam.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775945 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 23 Dec 2016 12:47:06 +0000 (12:47 +0000)]
On the 2.4.x branch: merge of r1775833 from trunk:
Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.
* modules/http2/h2_bucket_beam.c
register cleanup function on installation that NULLs the beamer
registry on pool cleanup.
Patch by: Pavel Mateja <pavel@verotel.cz
me
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775834 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:36:26 +0000 (12:36 +0000)]
Merge r1775770 from trunk:
pass along error buckets
In 2.4, they are generated by LimitRequestBody failures. trunk no
longer uses error buckets in this path, but someone else could.
PR60375
Submitted By: Eric Covener,Lubos Uhliarik <luhliari redhat.com>
Committed By: covener
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775832 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:35:29 +0000 (12:35 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775830 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:35:13 +0000 (12:35 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775829 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:34:47 +0000 (12:34 +0000)]
Merge r1775195 from trunk:
http_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
semantics to respectively warn the caller and cleanly terminate the connection
afterwards.
Suggested by: rpluem
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775828 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:34:28 +0000 (12:34 +0000)]
Merge r1775199, r1775664 from trunk:
Fix strict Host: header checking on EBCDIC
on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.
remove initial isascii check entirely
We are already checking an even narrower set of characters
just below.
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775827 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:33:29 +0000 (12:33 +0000)]
Merge r1775173 from trunk:
Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775826 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 23 Dec 2016 12:33:08 +0000 (12:33 +0000)]
Merge r1741570 from trunk:
* Silence compiler warning
Submitted by: rpluem
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775825 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 23 Dec 2016 12:11:16 +0000 (12:11 +0000)]
On the 2.4.x branch:
mod_http2: version bump after backport
* modules/http2/h2_version.h: increased version number
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775822 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 23 Dec 2016 11:41:29 +0000 (11:41 +0000)]
On the 2.4.x branch:
Merge r1775813 from trunk:
Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools
* modules/http2/h2_bucket_beam.c
- ignore send pools that are sub-pools of the existing one
- added h2_beam_send_from() to allow explicit registering of the
correct pool for the sending
* modules/http2/h2_bucket_beam.h
- add prototype for h2_beam_send_from()
* modules/http2/h2_mplx.c
- adding logging of output beam state
* modules/http2/h2_stream.c
- register stream pool for sending data on input beam
* modules/http2/h2_task.c
- register task pool on output beam on creation
- adding trace logging
* modules/http2/h2_proxy_session.c
- fixing a type in a comment while we're at it
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775816 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Dec 2016 23:40:36 +0000 (23:40 +0000)]
Vote, Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775778 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 22 Dec 2016 23:36:36 +0000 (23:36 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775777 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 22 Dec 2016 23:05:24 +0000 (23:05 +0000)]
propose ext_filter fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775771 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 22 Dec 2016 14:55:15 +0000 (14:55 +0000)]
solid morning... votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775670 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 22 Dec 2016 14:23:47 +0000 (14:23 +0000)]
axe the check entirely
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775666 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 21 Dec 2016 16:21:09 +0000 (16:21 +0000)]
fcgi patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775488 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 20 Dec 2016 09:05:36 +0000 (09:05 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775233 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 20 Dec 2016 03:40:35 +0000 (03:40 +0000)]
update viewvc shortcut
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775201 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 20 Dec 2016 03:40:16 +0000 (03:40 +0000)]
ebcdic fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775200 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 20 Dec 2016 01:33:53 +0000 (01:33 +0000)]
assign logno from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775197 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Dec 2016 20:39:06 +0000 (20:39 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775174 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 19 Dec 2016 20:29:13 +0000 (20:29 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1775172 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 Dec 2016 15:02:54 +0000 (15:02 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774896 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 18 Dec 2016 15:01:46 +0000 (15:01 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774895 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 16 Dec 2016 18:48:49 +0000 (18:48 +0000)]
Fix exported .mak output of mod_socache_memcache for '../generators' dependency
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774650 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 16 Dec 2016 18:26:03 +0000 (18:26 +0000)]
and we are now 2.4.26-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774647 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 16 Dec 2016 18:23:39 +0000 (18:23 +0000)]
Roll on 2.4.25
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774644 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 16 Dec 2016 18:21:24 +0000 (18:21 +0000)]
Merge r1774609 from trunk:
Add ../generators to include path for Windows
build of mod_socache_memcache. It now needs
mod_status.h.
Untested but exactly analogous to what works for
mod_socache_shmcb and others.
Submitted by: rjung
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774643 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 16 Dec 2016 15:45:47 +0000 (15:45 +0000)]
note CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774628 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 16 Dec 2016 15:44:07 +0000 (15:44 +0000)]
Merge r1706595 from trunk:
Follow-up to r1702948:
APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)
This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.
Submitted by: trawick
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1774626 13f79535 -47bb-0310-9956-
ffa450edef68