]>
granicus.if.org Git - apache/log
Stefan Eissing [Fri, 20 Nov 2015 15:13:11 +0000 (15:13 +0000)]
update of mod_http2 with current trunk version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715371 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:55:25 +0000 (19:55 +0000)]
Merge r1708107, r1709587, r1709602, r1709995, r1710231, r1710419, r1710572, r1710583, r1715023 from trunk:
mod_ssl: performing protocol switch directly after ALPN selection, mod_http2: connection hook inits network filters to force TLS handshake, reads input only if H2Direct explicitly enabled, changes H2Direct default to off even for cleartext connections
new ap_is_allowed_protocol() for testing configured protocols, added H2Upgrade on/off directive, changed H2Direct default back to on when h2c is in Protocols
moved ssl handshake trigger from mod_http2 to new process_connection hook in mod_ssl
mod_ssl: check request-server for TLS settings compatible to handshake server, allow request if equal, renegotiation checks: remember last used cipher_suite for optimizations, deny any regnegotiation in presence of master connection
announce protocol choices on first request
fixing compilation issue for older platform
disabling protocol upgrades on slave connections
first request on master connection only reports more preferred protocols in Upgrade header
mod_ssl: follow up to r1709602.
Fix "HTTP spoken on HTTPS port" broken by the SSL handshake trigger moved to
process_connection hook (r1709602) along with H2Direct speculative read.
Submitted by: icing, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715255 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:51:46 +0000 (19:51 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715252 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 19 Nov 2015 19:51:25 +0000 (19:51 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715251 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 16:10:37 +0000 (16:10 +0000)]
updated after incorporating change by ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715205 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 16:06:32 +0000 (16:06 +0000)]
merged r1715023 as proposed by ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1715202 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 19 Nov 2015 14:58:52 +0000 (14:58 +0000)]
update merge of changes in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1715192 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Nov 2015 14:35:16 +0000 (14:35 +0000)]
Conditional promotion :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715186 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 19 Nov 2015 08:45:52 +0000 (08:45 +0000)]
Comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715127 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:15:29 +0000 (16:15 +0000)]
Merge r1711553, r1713040, r1683881 from trunk:
Constify + save a few bytes in conf pool
Save a few bytes in conf pool when processing 'AllowOverrideList'.
The 'override_list' table is allocated from the cmd->pool, just as all strings from argv[].
So there is no need to duplicate them.
+ some minor style issues
Save a few bytes in conf pool
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715015 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:14:36 +0000 (16:14 +0000)]
Merge r1705194, r1705823, r1705826, r1705828, r1705833, r1706275, r1707230, r1707231 from trunk:
mod_ssl: forward EOR (only) brigades to the core_output_filter().
mod_ssl: don't FLUSH output (blocking) on read.
This defeats deferred write (and pipelining), eg. check_pipeline() is not
expecting the pipe to be flushed under it.
So let OpenSSL >= 0.9.8m issue the flush when necessary (earlier versions
are known to not handle all the cases, so we keep flushing with those).
mod_ssl: follow up to r1705823.
Oups, every #if needs a #endif...
mod_ssl: pass through metadata buckets untouched in ssl_io_filter_output(),
the core output filter needs them.
Proposed by: jorton
mod_ssl: follow up to r1705194, r1705823, r1705826 and r1705828.
Add CHANGES entry, and restore ap_process_request_after_handler()'s comment
as prior to r1705194 (the change makes no sense now).
mod_ssl: follow up to r1705823.
We still need to flush in the middle of a SSL/TLS handshake.
mod_ssl: follow up to r1705823.
Flush SSL/TLS handshake data when writing (instead of before reading),
and only when necessary (openssl < 0.9.8m or proxy/client side).
mod_ssl: follow up to r1707230: fix (inverted) logic for SSL_in_connect_init().
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715014 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:12:46 +0000 (16:12 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715013 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 18 Nov 2015 16:11:47 +0000 (16:11 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1715012 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 18 Nov 2015 08:49:22 +0000 (08:49 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714949 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 18 Nov 2015 06:42:41 +0000 (06:42 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714942 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:55:37 +0000 (09:55 +0000)]
update STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714745 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:48:54 +0000 (09:48 +0000)]
update STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714742 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 17 Nov 2015 09:27:58 +0000 (09:27 +0000)]
STATUS update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1714738 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 8 Nov 2015 08:14:21 +0000 (08:14 +0000)]
propose SSLStaplingReturnResponderErrors improvement fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713210 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2015 14:55:55 +0000 (14:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713142 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Nov 2015 14:55:07 +0000 (14:55 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1713141 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 15:30:18 +0000 (15:30 +0000)]
proposing set of core/mod_ssl changes for http/2 improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712568 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 15:15:16 +0000 (15:15 +0000)]
merge of
1708107 ,
1709587 ,
1709602 ,
1709995 ,
1710231 ,
1710419 ,
1710572 ,
1710583 from trunk, addition of master conn_rec*, minor bump of mmn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1712567 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 4 Nov 2015 12:38:16 +0000 (12:38 +0000)]
temp branch collecting changes for backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-changes@
1712542 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 4 Nov 2015 09:57:51 +0000 (09:57 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712521 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 4 Nov 2015 06:19:16 +0000 (06:19 +0000)]
Add a note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712475 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:31:28 +0000 (13:31 +0000)]
core: Fix scoreboard crash (SIGBUS) on hardware requiring strict 64bit
alignment (SPARC64, PPC64).
Submitted by: ylavic
Reviewed by: jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712294 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:27:54 +0000 (13:27 +0000)]
mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
fields as described in RFC7230. See OWS definition.
Submitted by: jailletc36
Reviewed by: ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712293 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:25:39 +0000 (13:25 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712292 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:15:00 +0000 (13:15 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712290 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 13:02:10 +0000 (13:02 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712286 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 3 Nov 2015 12:51:35 +0000 (12:51 +0000)]
Add a note.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712283 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Nov 2015 12:05:03 +0000 (12:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712269 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Nov 2015 12:02:43 +0000 (12:02 +0000)]
Merge r1710380, r1710391 from trunk:
Make the fix for fully qualifying REDIRECT_URL from PR#57785 opt-in.
followup to r1710380 -- refactored name and didn't have 'make depend'
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712268 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Nov 2015 12:00:06 +0000 (12:00 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712267 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Nov 2015 11:59:48 +0000 (11:59 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712266 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 3 Nov 2015 11:58:58 +0000 (11:58 +0000)]
Merge r1707831 from trunk:
PR 53845: Remove commented config regarding DNT because the spec now has CR status (confirming our interpretation) and MS has committed to changing their implementation: http://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/
Submitted by: fielding
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1712265 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 2 Nov 2015 08:23:54 +0000 (08:23 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711905 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 31 Oct 2015 16:35:54 +0000 (16:35 +0000)]
Votes, and moves to WORKING/STALE sections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711650 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 31 Oct 2015 16:27:45 +0000 (16:27 +0000)]
Propose scoreboard alignment fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711649 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 30 Oct 2015 20:54:44 +0000 (20:54 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711551 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 30 Oct 2015 20:53:18 +0000 (20:53 +0000)]
Fix a typo in doc as spotted by ceving in online doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711549 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Fri, 30 Oct 2015 14:09:58 +0000 (14:09 +0000)]
Propose r1711479.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711482 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 28 Oct 2015 18:48:42 +0000 (18:48 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711101 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 28 Oct 2015 18:40:59 +0000 (18:40 +0000)]
Add compatibility note to mod_http2 doc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711098 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Wed, 28 Oct 2015 18:37:27 +0000 (18:37 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1711097 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 27 Oct 2015 21:22:24 +0000 (21:22 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710891 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 25 Oct 2015 11:57:28 +0000 (11:57 +0000)]
Extend expression parser registration to support
ssl variables in any expression using
mod_rewrite syntax "%{SSL:VARNAME}" or function
syntax "ssl(VARNAME)".
Backport of r1707002 and r1709596 from trunk.
Committed By: rjung
Backported By: rjung
Reviewed by: rjung, ylavic, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710433 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 25 Oct 2015 09:21:57 +0000 (09:21 +0000)]
vote+promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710418 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 25 Oct 2015 09:17:13 +0000 (09:17 +0000)]
Fix URL
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710417 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 24 Oct 2015 23:46:41 +0000 (23:46 +0000)]
missing CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710406 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 24 Oct 2015 21:35:24 +0000 (21:35 +0000)]
broke build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710392 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 24 Oct 2015 19:15:21 +0000 (19:15 +0000)]
propose REDIRECT_URL change and vote for DNT
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1710381 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Tue, 20 Oct 2015 18:52:09 +0000 (18:52 +0000)]
A pox on those who capitalize comments in 2.4.x without first being anal on trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1709662 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 20 Oct 2015 14:03:00 +0000 (14:03 +0000)]
Add a note about the version number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1709597 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 20 Oct 2015 13:58:22 +0000 (13:58 +0000)]
Add a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1709591 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 20 Oct 2015 13:42:32 +0000 (13:42 +0000)]
Comment on mod_systemd in STATUS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1709588 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 14 Oct 2015 02:21:14 +0000 (02:21 +0000)]
We no longer have .msi packages for windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1708542 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 13 Oct 2015 17:34:00 +0000 (17:34 +0000)]
released today!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1708473 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 12 Oct 2015 18:03:22 +0000 (18:03 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1708185 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 11 Oct 2015 13:55:23 +0000 (13:55 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707982 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 11 Oct 2015 13:51:56 +0000 (13:51 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707979 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 10 Oct 2015 15:58:26 +0000 (15:58 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707891 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 10 Oct 2015 15:43:42 +0000 (15:43 +0000)]
Merge r1707889 from trunk: docs: s/h2_module/http2_module/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707890 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 10 Oct 2015 15:29:57 +0000 (15:29 +0000)]
Fix small typo in new docs.
CTR
Backport of r1707883 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707887 13f79535 -47bb-0310-9956-
ffa450edef68
Roy T. Fielding [Fri, 9 Oct 2015 23:43:18 +0000 (23:43 +0000)]
wake up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707832 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 9 Oct 2015 23:02:54 +0000 (23:02 +0000)]
docs nit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707830 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 9 Oct 2015 17:26:05 +0000 (17:26 +0000)]
And we are 2.4.18-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707774 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 9 Oct 2015 17:24:40 +0000 (17:24 +0000)]
Get ready to tag 2.4.17
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707772 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 9 Oct 2015 01:03:31 +0000 (01:03 +0000)]
add nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707641 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Oct 2015 22:58:07 +0000 (22:58 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707632 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Oct 2015 22:44:21 +0000 (22:44 +0000)]
Add event in mpm docs where currently only
worker is mentioned. Existing worker text
applies to event without changes.
Thanks to Mathijs Schmittmann.
CTR
Backport of r1707626 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707631 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 8 Oct 2015 22:40:53 +0000 (22:40 +0000)]
Sort MPMs given in modulelist uniformly, list
most important or common ones first.
CTR
Backport of r1707627 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707629 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 8 Oct 2015 19:26:51 +0000 (19:26 +0000)]
Backport r1705791
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707612 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 8 Oct 2015 17:57:17 +0000 (17:57 +0000)]
merge r1707591
remove conf/extra/http-h2.conf.in from install filelist
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707592 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Oct 2015 14:49:35 +0000 (14:49 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707557 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 8 Oct 2015 14:48:31 +0000 (14:48 +0000)]
r1678763 | ylavic | 2015-05-11 16:53:34 +0200 (Mon, 11 May 2015) | 7 lines
mod_proxy: only cleanup the socket for a connection asked to be closed but
whose address can still be reused.
This saves unnecessary socket pool destroy and creation at cleanup and reuse
time, plus the same initialization of conn->pool's associated data which can
be reused in that case.
r1703807 | ylavic | 2015-09-18 12:58:58 +0200 (Fri, 18 Sep 2015) | 5 lines
mod_proxy: don't recyle backend announced "Connection: close" connections.
Failing to do this may lead to a race condition where we send a new request
before the backend really closes the connection (or lost SSL-Alert/FIN make
us think the connection is still alive, until the retransmission).
r1703813 | ylavic | 2015-09-18 13:48:31 +0200 (Fri, 18 Sep 2015) | 1 line
mod_proxy: follow up to r1703807: CHANGES entry.
Submitted by: ylavic
Committed by: ylavic
Reviewed by: ylavic, rjung, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707556 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 8 Oct 2015 12:55:53 +0000 (12:55 +0000)]
backport of old h2 doc removal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707520 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 8 Oct 2015 12:16:25 +0000 (12:16 +0000)]
backport of trunk:r1707497, fixes nghttp 1.3.x interop, bump version to 1.0.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707511 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 7 Oct 2015 23:19:47 +0000 (23:19 +0000)]
vote, promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707418 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Oct 2015 11:37:54 +0000 (11:37 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707263 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Oct 2015 11:03:22 +0000 (11:03 +0000)]
Fix commit revision of Rainer's proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707241 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 7 Oct 2015 10:59:42 +0000 (10:59 +0000)]
Update mod_ssl (flush) proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707240 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 7 Oct 2015 07:43:06 +0000 (07:43 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707195 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 21:39:45 +0000 (21:39 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707151 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 19:37:14 +0000 (19:37 +0000)]
Remove mod_h2 docs files forgotten after h2 to
http2 renaming.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707124 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 19:31:59 +0000 (19:31 +0000)]
Add a docs remark about "SSLOptions StdEnvVars"
being not necessary for mod_rewrite
"%{SSL:VARIABLE}" feature and for the mod_ssl
extensions to mod_log_config (%{VARIABLE}x).
Xforms.
CTR
Backport of r1706989 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707123 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 19:17:10 +0000 (19:17 +0000)]
Fix new XML error in mod_subtitute docs.
Followup to r1707039.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707122 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 19:11:28 +0000 (19:11 +0000)]
Agree with comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707121 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:40:06 +0000 (12:40 +0000)]
Merge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343, r1697013, r1697015 from trunk:
mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]
mod_substitute: follow up r1684900.
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.
mod_substitute: follow up to r1687539.
Use tristate single inherit_before variable instead of two, according to
wrowe's advices.
mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).
Very difficult to read, and therefore was wrong.
Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.
Optimize in all cases that the members are all explicitly initialized.
Useful for 2.2 and 2.4, but trunk will require the subsequent patch.
Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.
Net -8 LoC, my usual specialty.
This didn't need to be reinvented; please use established helpers.
mod_substitute: follow up r1688339.
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.
mod_substitute: follow up r1697013.
Update the doc.
Submitted by: niq, ylavic, ylavic, ylavic, wrowe, wrowe, wrowe, wrowe, ylavic, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707039 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:37:09 +0000 (12:37 +0000)]
Merge r1706918 from trunk:
m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.
Submitted by: olli hauer <ohauer gmx.de>
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707038 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:36:36 +0000 (12:36 +0000)]
Merge r1705983 from trunk:
Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707037 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:36:14 +0000 (12:36 +0000)]
Merge r1705776 from trunk:
Adjust since we are now in shared mem area
Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707036 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:35:50 +0000 (12:35 +0000)]
Merge r1629916 from trunk:
core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707035 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 12:23:41 +0000 (12:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707030 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 12:11:19 +0000 (12:11 +0000)]
Promote one more.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707024 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 12:10:33 +0000 (12:10 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707023 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 11:50:36 +0000 (11:50 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707013 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 11:49:37 +0000 (11:49 +0000)]
Some simple votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1707011 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Oct 2015 11:07:42 +0000 (11:07 +0000)]
this is stalled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1706986 13f79535 -47bb-0310-9956-
ffa450edef68
projects / apache / log