]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Yann Ylavic [Fri, 2 Jun 2017 10:58:38 +0000 (10:58 +0000)]
Merge r1783849 from trunk:
MPMs unix: Place signals handlers and helpers out of DSOs to avoid
a possible crash if a signal is caught during (graceful) restart.
PR 60487.
Reviewedby: ylavic, wrowe, icing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797368 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Jun 2017 09:13:31 +0000 (09:13 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797337 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Jun 2017 09:03:57 +0000 (09:03 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797334 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 1 Jun 2017 18:34:13 +0000 (18:34 +0000)]
fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797242 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 31 May 2017 12:03:47 +0000 (12:03 +0000)]
Note show-stopper
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1797021 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 31 May 2017 01:36:10 +0000 (01:36 +0000)]
Good catch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796965 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 17:09:11 +0000 (17:09 +0000)]
wstunnel vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796895 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 30 May 2017 13:44:20 +0000 (13:44 +0000)]
propose jfclere's issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796866 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:28:20 +0000 (12:28 +0000)]
SECURITY: CVE-2017-7668 (cve.mitre.org)
The HTTP strict parsing changes added in 2.2.32 and 2.4.24 introduced a
bug in token list parsing, which allows ap_find_token() to search past
the end of its input string. By maliciously crafting a sequence of
request headers, an attacker may be able to cause a segmentation fault,
or to force ap_find_token() to return an incorrect value.
Merge r1796350 from trunk:
short-circuit on NULL
Submitted by: jchampion, covener
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:27:41 +0000 (12:27 +0000)]
SECURITY: CVE-2017-3167 (cve.mitre.org)
Use of the ap_get_basic_auth_pw() by third-party modules outside of the
authentication phase may lead to authentication requirements being
bypassed.
Merge r1796348 from trunk:
core: Deprecate ap_get_basic_auth_pw() and add ap_get_basic_auth_components().
Submitted By: Emmanuel Dreyfus <manu netbsd.org>, jchampion, coverner
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:26:05 +0000 (12:26 +0000)]
SECURITY: CVE-2017-3169 (cve.mitre.org)
mod_ssl may dereference a NULL pointer when third-party modules call
ap_hook_process_connection() during an HTTP request to an HTTPS port.
Merge r1796343 from trunk:
mod_ssl: fix ctx passed to ssl_io_filter_error()
Consistently pass the expected bio_filter_in_ctx_t
to ssl_io_filter_error().
Submitted by: ylavic, covener
Reviewed by: covener, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796854 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:25:13 +0000 (12:25 +0000)]
Merge r1795635 from trunk:
When processing a 'SetEnv' directive, warn if the environment variable name includes a '='. It is likely a configuration error. PR 60249
Submitted by: jailletc36
Reviewed by: jailletc36, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796853 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:24:22 +0000 (12:24 +0000)]
Merge r1776463 from trunk:
PR60009: RewriteRule local prefix checking update
*) mod_rewrite: When a substitution is a fully qualified URL, and the
scheme/host/port matches the current virtual host, stop interpreting the
path component as a local path just because the first component of the
path exists in the filesystem. Adds RewriteOption "LegacyPrefixDocRoot"
to revert to previous behavior. PR60009.
Submitted By: Hank Ibell <hwibell gmail.com>
Submitted by: covener
Reviewed by: covener, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796852 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:19:58 +0000 (12:19 +0000)]
Merge r1584417, r1585157 from trunk:
allow users to workaround the over-agressive backreference
escaping by selecting the characters to escape.
add BNP flag to give control to the user on whether a space ' ' in
an escaped backrefernece is decoded to a + (default) or %20. Useful
if your backreference isn't going into the query string.
Submitted by: covener
Reviewed by: jailletc36, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796850 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:18:18 +0000 (12:18 +0000)]
Merge r1796446 from trunk:
PR61124: ap_parse_form_data() EBCDIC fix
URL-decoding doesn't work on EBCDIC.
Submitted By: Hank Ibell <hwibell gmail.com>
Submitted by: covener
Reviewed by: covener, rjung, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796849 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:16:56 +0000 (12:16 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796848 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 30 May 2017 12:16:31 +0000 (12:16 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1796847 13f79535 -47bb-0310-9956-
ffa450edef68