]> granicus.if.org Git - apache/log
apache
7 years agoAnd we are 2.4.28-dev
Jim Jagielski [Thu, 6 Jul 2017 17:39:58 +0000 (17:39 +0000)]
And we are 2.4.28-dev

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

7 years agoGet ready to tag 2.4.27
Jim Jagielski [Thu, 6 Jul 2017 17:37:42 +0000 (17:37 +0000)]
Get ready to tag 2.4.27

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

7 years agomake COMPATIBILITY entries explicit
Jim Jagielski [Thu, 6 Jul 2017 16:25:24 +0000 (16:25 +0000)]
make COMPATIBILITY entries explicit

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

7 years agomore meat re: lua compatibility "break"
Jim Jagielski [Thu, 6 Jul 2017 16:12:52 +0000 (16:12 +0000)]
more meat re: lua compatibility "break"

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

7 years agoCHANGES: note mod_lua compatibility break
Jacob Champion [Thu, 6 Jul 2017 15:48:51 +0000 (15:48 +0000)]
CHANGES: note mod_lua compatibility break

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

7 years agoMerge r1800978 from trunk:
Jim Jagielski [Thu, 6 Jul 2017 12:58:22 +0000 (12:58 +0000)]
Merge r1800978 from trunk:

On the trunk:

mod_http2: Simplify ready queue, less memory and better performance. Update
     mod_http2 version to 1.10.7.

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

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

7 years agoVote, promote.
Yann Ylavic [Thu, 6 Jul 2017 12:54:37 +0000 (12:54 +0000)]
Vote, promote.

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

7 years agovote on http2 backport
Jim Jagielski [Thu, 6 Jul 2017 09:24:27 +0000 (09:24 +0000)]
vote on http2 backport

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

7 years agopropose backport
Stefan Eissing [Thu, 6 Jul 2017 09:02:30 +0000 (09:02 +0000)]
propose backport

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

7 years agoFix negotiation type parsing to be strict about "*", "*/*" and "type/*"
William A. Rowe Jr [Thu, 6 Jul 2017 00:04:41 +0000 (00:04 +0000)]
Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>
Backports: r1800917
Reviewed by: wrowe, jim, jchampion

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

7 years agoSECURITY: CVE-2017-9788: Uninitialized memory reflection in mod_auth_digest.
William A. Rowe Jr [Thu, 6 Jul 2017 00:02:54 +0000 (00:02 +0000)]
SECURITY: CVE-2017-9788: Uninitialized memory reflection in mod_auth_digest.

The value placeholder in [Proxy-]Authorization headers type 'Digest' was not
initialized or reset before or between successive key=value assignments by
mod_auth_digest.  Providing an initial key with no '=' assignment could reflect
the stale value of uninitialized pool memory used by the prior request, leading
to leakage of potentially confidential information, and a segfault.

Submitted by: wrowe
Backports: r1800919
Reviewed by: wrowe, jim, jchampion

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

7 years agoVote/promote another.
Jacob Champion [Wed, 5 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Vote/promote another.

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

7 years agoVote/promote one.
Jacob Champion [Wed, 5 Jul 2017 19:57:40 +0000 (19:57 +0000)]
Vote/promote one.

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

7 years agovote
Jim Jagielski [Wed, 5 Jul 2017 19:55:21 +0000 (19:55 +0000)]
vote

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

7 years agoTwo more string parsing oddities for consideration
William A. Rowe Jr [Wed, 5 Jul 2017 19:46:35 +0000 (19:46 +0000)]
Two more string parsing oddities for consideration

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

7 years agoMark backported patch 1800173 in commit 1800215
William A. Rowe Jr [Wed, 5 Jul 2017 17:34:47 +0000 (17:34 +0000)]
Mark backported patch 1800173 in commit 1800215

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

7 years agoMerge r1800788 from trunk:
Jim Jagielski [Wed, 5 Jul 2017 11:51:18 +0000 (11:51 +0000)]
Merge r1800788 from trunk:

Add mod_proxy_hcheck to generated httpd.spec file.  PR 60506.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jim

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

7 years agopromote
Jim Jagielski [Wed, 5 Jul 2017 11:50:49 +0000 (11:50 +0000)]
promote

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

7 years agovote on rpm change
Jim Jagielski [Wed, 5 Jul 2017 11:50:35 +0000 (11:50 +0000)]
vote on rpm change

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

7 years ago* Vote
Ruediger Pluem [Wed, 5 Jul 2017 06:10:14 +0000 (06:10 +0000)]
* Vote

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

7 years agomod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
Rainer Jung [Tue, 4 Jul 2017 22:28:38 +0000 (22:28 +0000)]
mod_lua: Improve compatibility with Lua 5.1, 5.2 and 5.3.
PR58188, PR60831, PR61245.

CTR

The following lua 5.2 and 5.3 compat change
should be checked for runtime correctness
by someone more knowledgeable about lua.

Index: modules/lua/lua_apr.c
--- modules/lua/lua_apr.c (original)
+++ modules/lua/lua_apr.c Tue Jul  4 20:48:43 2017
@@ -82,7 +82,11 @@ static const luaL_Reg lua_table_methods[
 int ap_lua_init(lua_State *L, apr_pool_t *p)
 {
     luaL_newmetatable(L, "Apr.Table");
+#if LUA_VERSION_NUM < 502
     luaL_register(L, "apr_table", lua_table_methods);
+#else
+    luaL_newlib(L, lua_table_methods);
+#endif
     lua_pushstring(L, "__index");
     lua_pushstring(L, "get");
     lua_gettable(L, 2);

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

7 years agoPropose.
Yann Ylavic [Tue, 4 Jul 2017 14:06:02 +0000 (14:06 +0000)]
Propose.

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

7 years agoMerge r1800594 from trunk:
Jim Jagielski [Tue, 4 Jul 2017 12:35:11 +0000 (12:35 +0000)]
Merge r1800594 from trunk:

* Do not apply the strict permissions of the temporary file to a possibly
  existing passwd file.
  This long standing bug was triggered by fixing a bug in APR in r1791029.

PR: 61240

Submitted by: rpluem
Reviewed by: rpluem, ylavic, jim

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

7 years agoSECURITY: CVE-2017-9789: Read after free in mod_http2.
Jim Jagielski [Tue, 4 Jul 2017 12:34:15 +0000 (12:34 +0000)]
SECURITY: CVE-2017-9789: Read after free in mod_http2.

When under stress, closing many connections, the HTTP/2
handling code would sometimes access memory after it has
been freed, resulting in potentially erratic behaviour.

Merge r1800689 from trunk:

Disable and give warning when mpm_prefork is encountered.
The server will continue to work, but HTTP/2 will no longer be negotiated.

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

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

7 years agopromote
Jim Jagielski [Tue, 4 Jul 2017 12:33:05 +0000 (12:33 +0000)]
promote

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

7 years agoVotes on backports
Jim Jagielski [Tue, 4 Jul 2017 12:32:46 +0000 (12:32 +0000)]
Votes on backports

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

7 years agoVotes.
Yann Ylavic [Tue, 4 Jul 2017 11:57:31 +0000 (11:57 +0000)]
Votes.

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

7 years ago* Propose
Ruediger Pluem [Tue, 4 Jul 2017 06:38:10 +0000 (06:38 +0000)]
* Propose

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

7 years agoOn the 2.4.x branch:
Stefan Eissing [Mon, 3 Jul 2017 15:49:30 +0000 (15:49 +0000)]
On the 2.4.x branch:

propose backport of http2/prefork disabling.

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

7 years agoNote proposed T&R for this Thurs (July 6th)
Jim Jagielski [Mon, 3 Jul 2017 12:05:20 +0000 (12:05 +0000)]
Note proposed T&R for this Thurs (July 6th)

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

7 years agoMerge r1800306, r1800393 from trunk:
Jim Jagielski [Mon, 3 Jul 2017 10:22:07 +0000 (10:22 +0000)]
Merge r1800306, r1800393 from trunk:

proxy_fcgi: remove FPM-specific logic

Reverts r1780328, r1780329, and their associated followups, which
incorrectly manipulated SCRIPT_NAME by default. All proxy_fcgi.t
regression tests now pass.

PR: 61202

Partial reversal of r1800306... note virtual scripts in notes

Submitted by: jchampion, jim
Reviewed by: jchampion, jim, covener

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

7 years agovote/promote fcgi
Eric Covener [Sun, 2 Jul 2017 21:27:16 +0000 (21:27 +0000)]
vote/promote fcgi

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

7 years agovote on fcgi backport
Jim Jagielski [Sat, 1 Jul 2017 13:42:00 +0000 (13:42 +0000)]
vote on fcgi backport

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

7 years agoPR61202: add virtual_script note back to backport (un-revert)
Jacob Champion [Fri, 30 Jun 2017 21:52:59 +0000 (21:52 +0000)]
PR61202: add virtual_script note back to backport (un-revert)

Per ML discussion; thanks to Jim for pointing this out.

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

7 years agoPropose showstopper.
Jacob Champion [Thu, 29 Jun 2017 18:06:49 +0000 (18:06 +0000)]
Propose showstopper.

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

7 years agoMerge r1551611, r1783765, r1788996, r1788998, r1789000, r1795651 from trunk:
Jim Jagielski [Thu, 29 Jun 2017 11:31:20 +0000 (11:31 +0000)]
Merge r1551611, r1783765, r1788996, r1788998, r1789000, r1795651 from trunk:

Log a warning when the LDAP authn provider is configured but an AuthLDAPURL
isn't -- IOW, avoid silently skipping a misconfigured [or buggy?] LDAP provider.

Follow up to r1772919: update APLOGNO().

Save a few cycles.
'apr_pstrcatv' can compute the length of the new string for us.

Improve indentation

Group bit field values in order to save some memory.

Add an explicit NULL to initialise a field in an authn_provider structure, as done in all other places.  PR 60636
Submitted by: covener, ylavic, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed by: jailletc36, jim, ylavic

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

7 years agoMerge r1735906 from trunk:
Jim Jagielski [Thu, 29 Jun 2017 11:29:11 +0000 (11:29 +0000)]
Merge r1735906 from trunk:

Avoid a call to 'prep_walk_cache' if possible, just as in 'ap_if_walk' and 'ap_location_walk'
Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic

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

7 years agoRestore single-char field names inadvertantly disallowed in 2.4.25.
William A. Rowe Jr [Thu, 29 Jun 2017 00:16:27 +0000 (00:16 +0000)]
Restore single-char field names inadvertantly disallowed in 2.4.25.
Backports: r1800173
PR: 61220
Submitted by: ylavic
Reviewed by: wrowe, jchampion, ylavic

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

7 years agoVote, promote.
Jacob Champion [Wed, 28 Jun 2017 21:32:04 +0000 (21:32 +0000)]
Vote, promote.

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

7 years agoVote, promote.
Yann Ylavic [Wed, 28 Jun 2017 18:33:35 +0000 (18:33 +0000)]
Vote, promote.

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

7 years agoActually this was a vote for 1800111, not the revised patch
William A. Rowe Jr [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Actually this was a vote for 1800111, not the revised patch

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

7 years agoVote, promote.
Yann Ylavic [Wed, 28 Jun 2017 15:49:07 +0000 (15:49 +0000)]
Vote, promote.

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

7 years agoPropose Yann's alternative
William A. Rowe Jr [Wed, 28 Jun 2017 14:19:28 +0000 (14:19 +0000)]
Propose Yann's alternative

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

7 years ago* Vote
Ruediger Pluem [Wed, 28 Jun 2017 06:20:41 +0000 (06:20 +0000)]
* Vote

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

7 years agoProposed
William A. Rowe Jr [Wed, 28 Jun 2017 02:36:34 +0000 (02:36 +0000)]
Proposed

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

7 years agoMerge r1799784, r1799786 from trunk:
Jim Jagielski [Mon, 26 Jun 2017 12:20:14 +0000 (12:20 +0000)]
Merge r1799784, r1799786 from trunk:

Since r1753257, "HEAD" method is registered into the registry hash with the M_GET ID.
(r1757672 in 2.4.x)

We iterate over all the values of the registery, so there is no need anymore to have a special case for "HEAD" in  'make_allow()'. It has its own entry now.

With the current code, we have "HEAD" 3 times in the Allow Header field.
This is because we find M_GET 2 times in the registry hash. The first one gives "GET" and "HEAD" (as the special handling), and the second "HEAD" and "HEAD" (as the special handling).

BTW, use APR_ARRAY_PUSH instead of hand coding it, in oder to have the code more readable.

PR 61207

Add  CHANGE entry
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, jim

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

7 years agopromote proposal
Jim Jagielski [Mon, 26 Jun 2017 12:18:53 +0000 (12:18 +0000)]
promote proposal

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

7 years agovote on 61207
Jim Jagielski [Mon, 26 Jun 2017 12:18:26 +0000 (12:18 +0000)]
vote on 61207

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

7 years agomod_http2 is no longer experimental nor CTR
Jim Jagielski [Mon, 26 Jun 2017 12:17:43 +0000 (12:17 +0000)]
mod_http2 is no longer experimental nor CTR

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

7 years ago* Vote
Ruediger Pluem [Mon, 26 Jun 2017 06:13:59 +0000 (06:13 +0000)]
* Vote

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

7 years agoRebuild.
Lucien Gentis [Sun, 25 Jun 2017 14:49:38 +0000 (14:49 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sun, 25 Jun 2017 14:48:43 +0000 (14:48 +0000)]
XML updates.

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

7 years agodocumentation rebuild
Luca Toscano [Sun, 25 Jun 2017 08:32:32 +0000 (08:32 +0000)]
documentation rebuild

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

7 years agocore.xml: Wrap a Define directive sentence in a <note>
Luca Toscano [Sun, 25 Jun 2017 08:28:12 +0000 (08:28 +0000)]
core.xml: Wrap a Define directive sentence in a <note>

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

7 years agoProposal
Christophe Jaillet [Sun, 25 Jun 2017 07:11:45 +0000 (07:11 +0000)]
Proposal

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

7 years agoRemove a dead link (/docs/STATUS)
Christophe Jaillet [Wed, 21 Jun 2017 17:50:04 +0000 (17:50 +0000)]
Remove a dead link (/docs/STATUS)
Remove a link to an EOL branch (2.0)

Add some links to APR & APR-Util 1.6.
Add release date for 2.4.26

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

7 years agocombine duplicates
Eric Covener [Mon, 19 Jun 2017 16:59:25 +0000 (16:59 +0000)]
combine duplicates

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

7 years agoNOTE CVEs
Jim Jagielski [Mon, 19 Jun 2017 16:36:07 +0000 (16:36 +0000)]
NOTE CVEs

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

7 years agosmash dup
Jim Jagielski [Wed, 14 Jun 2017 11:14:20 +0000 (11:14 +0000)]
smash dup

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

7 years agoAnd we are now 2.4.27-dev
Jim Jagielski [Tue, 13 Jun 2017 17:29:26 +0000 (17:29 +0000)]
And we are now 2.4.27-dev

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

7 years agoRoll on 2.4.26
Jim Jagielski [Tue, 13 Jun 2017 17:26:16 +0000 (17:26 +0000)]
Roll on 2.4.26

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

7 years agoxform
Jim Jagielski [Mon, 12 Jun 2017 17:15:09 +0000 (17:15 +0000)]
xform

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

7 years agowrong module :) Thx eric
Jim Jagielski [Mon, 12 Jun 2017 17:13:40 +0000 (17:13 +0000)]
wrong module :) Thx eric

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

7 years agoxform
Jim Jagielski [Mon, 12 Jun 2017 15:47:57 +0000 (15:47 +0000)]
xform

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

7 years agomore tags
Jim Jagielski [Mon, 12 Jun 2017 15:43:51 +0000 (15:43 +0000)]
more tags

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

7 years agoNote that as of 2.4.26, HTTP/2 is no longer considered "experimental"
Jim Jagielski [Mon, 12 Jun 2017 14:13:50 +0000 (14:13 +0000)]
Note that as of 2.4.26, HTTP/2 is no longer considered "experimental"

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

7 years agoxforms
Jim Jagielski [Mon, 12 Jun 2017 14:12:28 +0000 (14:12 +0000)]
xforms

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

7 years agono longer experimental
Jim Jagielski [Mon, 12 Jun 2017 14:11:37 +0000 (14:11 +0000)]
no longer experimental

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

7 years agoxforms
Jim Jagielski [Mon, 12 Jun 2017 14:10:02 +0000 (14:10 +0000)]
xforms

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

7 years agoWill be no longer experimental
Jim Jagielski [Mon, 12 Jun 2017 14:08:56 +0000 (14:08 +0000)]
Will be no longer experimental

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

7 years agoFix Typo.
Lucien Gentis [Sat, 10 Jun 2017 16:45:24 +0000 (16:45 +0000)]
Fix Typo.

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

7 years agoRebuild.
Lucien Gentis [Sat, 10 Jun 2017 16:41:15 +0000 (16:41 +0000)]
Rebuild.

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

7 years agoXML updates.
Lucien Gentis [Sat, 10 Jun 2017 16:40:01 +0000 (16:40 +0000)]
XML updates.

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

7 years agoxforms
Eric Covener [Sat, 10 Jun 2017 15:51:28 +0000 (15:51 +0000)]
xforms

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

7 years agocorrect release
Eric Covener [Sat, 10 Jun 2017 15:51:01 +0000 (15:51 +0000)]
correct release

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

7 years agoAdd proposed T&R date for 2.4.26
Jim Jagielski [Thu, 8 Jun 2017 17:00:47 +0000 (17:00 +0000)]
Add proposed T&R date for 2.4.26

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

7 years agonote some changes re: http2 as "experimental" and ctr/rtc
Jim Jagielski [Thu, 8 Jun 2017 16:33:30 +0000 (16:33 +0000)]
note some changes re: http2 as "experimental" and ctr/rtc

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

7 years agotypo
Jim Jagielski [Thu, 8 Jun 2017 16:32:21 +0000 (16:32 +0000)]
typo

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

7 years agoOn the 2.4.x branch:
Stefan Eissing [Tue, 6 Jun 2017 09:22:52 +0000 (09:22 +0000)]
On the 2.4.x branch:

mod_http2 showstopper resolved.

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

7 years agoOn the 2.4.x branch:
Stefan Eissing [Tue, 6 Jun 2017 09:08:25 +0000 (09:08 +0000)]
On the 2.4.x branch:

Merged /httpd/httpd/trunk:r1797745

mod_http2: Fix for possible CPU busy loop introduced in v1.10.3 where a stream may keep
     the session in continuous check for state changes that never happen.

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

7 years agoretracting proposal as RTC seems not to be in effect yet
Stefan Eissing [Tue, 6 Jun 2017 08:51:07 +0000 (08:51 +0000)]
retracting proposal as RTC seems not to be in effect yet

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

7 years agoproposing mod_http2 busy loop fix
Stefan Eissing [Tue, 6 Jun 2017 08:38:33 +0000 (08:38 +0000)]
proposing mod_http2 busy loop fix

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

7 years agoFix typo.
Christophe Jaillet [Tue, 6 Jun 2017 06:01:00 +0000 (06:01 +0000)]
Fix typo.

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

7 years agoxforms
Eric Covener [Mon, 5 Jun 2017 12:13:24 +0000 (12:13 +0000)]
xforms

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

7 years agoSECURITY: CVE-2017-7679 (cve.mitre.org)
Eric Covener [Mon, 5 Jun 2017 12:12:31 +0000 (12:12 +0000)]
SECURITY: CVE-2017-7679 (cve.mitre.org)
mod_mime can read one byte past the end of a buffer when sending a
malicious Content-Type response header.

Merge 1797550 from trunk:
mod_mime: fix quoted pair scanning

Submitted By: ylavic
Reviewed By: covener, ylavic, jim

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

7 years agobackported in r1797651
Eric Covener [Mon, 5 Jun 2017 12:10:05 +0000 (12:10 +0000)]
backported in r1797651

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

7 years agoMerge from trunk:
Eric Covener [Mon, 5 Jun 2017 12:09:49 +0000 (12:09 +0000)]
Merge from trunk:

mpm_{worker,prefork}: save some cycles by not copying the listener's pollfds
for each pollset operation.

We don't need a copy when poll()ing if those are allocated with the correct
lifetime (the listener thread) at the very beginning.

  *) worker, prefork: save some cycles by not copying the listener's pollfds
                      for each pollset operation
     trunk patch: http://svn.apache.org/r1662437
     2.4.x patch: svn merge -c 1662437 ^/httpd/httpd/trunk .
     +1: jailletc36, ylavic, jim

Submitted By: jailletc36
Reviewed By: jailletc36, ylavic, jim

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

7 years agoMerge from trunk:
Eric Covener [Mon, 5 Jun 2017 12:07:43 +0000 (12:07 +0000)]
Merge from trunk:

Add upgrade parameter to mod_proxy_wstunnel.
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
 https://issues.jboss.org/browse/JBCS-254
 https://issues.jboss.org/browse/JBCS-291

whitespace only

Submitted By: jfclere
Reviewed By: covener, jim, ylavic

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

7 years agomay or may not be a show-stopper :P
Jim Jagielski [Mon, 5 Jun 2017 11:17:20 +0000 (11:17 +0000)]
may or may not be a show-stopper :P

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

7 years agopromote
Jim Jagielski [Mon, 5 Jun 2017 11:16:54 +0000 (11:16 +0000)]
promote

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

7 years agovotes
Jim Jagielski [Mon, 5 Jun 2017 11:16:14 +0000 (11:16 +0000)]
votes

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

7 years agoRemove spaces in svn command
Christophe Jaillet [Sun, 4 Jun 2017 14:53:00 +0000 (14:53 +0000)]
Remove spaces in svn command

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

7 years agoPropose
Christophe Jaillet [Sun, 4 Jun 2017 14:51:11 +0000 (14:51 +0000)]
Propose

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

7 years agoPropose
Christophe Jaillet [Sun, 4 Jun 2017 06:57:28 +0000 (06:57 +0000)]
Propose

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

7 years agoVote.
Yann Ylavic [Sat, 3 Jun 2017 22:10:59 +0000 (22:10 +0000)]
Vote.

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

7 years agopropose
Eric Covener [Sat, 3 Jun 2017 22:06:32 +0000 (22:06 +0000)]
propose

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

7 years agoLINK : warning LNK4013: image size 0x35000 exceeds specified maximum 0x30000
Gregg Lewis Smith [Sat, 3 Jun 2017 18:07:43 +0000 (18:07 +0000)]
LINK : warning LNK4013: image size 0x35000 exceeds specified maximum 0x30000

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

7 years agoWithdraw unrelated comment, and vote.
Yann Ylavic [Fri, 2 Jun 2017 23:38:24 +0000 (23:38 +0000)]
Withdraw unrelated comment, and vote.

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

7 years agoVote (+promote), comment.
Yann Ylavic [Fri, 2 Jun 2017 23:24:56 +0000 (23:24 +0000)]
Vote (+promote), comment.

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

7 years agoPropose
Christophe Jaillet [Fri, 2 Jun 2017 20:30:04 +0000 (20:30 +0000)]
Propose

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