]>
granicus.if.org Git - apache/log
Yann Ylavic [Thu, 26 Mar 2015 08:32:10 +0000 (08:32 +0000)]
Propose TCP_NOPUSH fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669293 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Mar 2015 18:45:16 +0000 (18:45 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669207 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 25 Mar 2015 18:44:05 +0000 (18:44 +0000)]
http://httpd.apache.org/docs/2.2/mod/mod_ext_filter.html#comment_3822
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669205 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Mar 2015 16:04:11 +0000 (16:04 +0000)]
Update mod_proxy-transfer patch to v3 (v2 was missing APR_EBADF case).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669141 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Mar 2015 15:28:27 +0000 (15:28 +0000)]
Update mod_proxy-transfer patch to address Eric's concerns.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669133 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Mar 2015 12:29:03 +0000 (12:29 +0000)]
Update mod_proxy_http proposal (missing ap_proxy_connection_reusable() in 2.4.x), and remove Eric's vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1669102 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:11:05 +0000 (13:11 +0000)]
remove typo and reflow
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668880 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:08:44 +0000 (13:08 +0000)]
Merge r1664205 from trunk:
*) SECURITY: CVE-2015-0253 (cve.mitre.org)
core: Fix a crash introduced in with ErrorDocument 400 pointing
to a local URL-path with the INCLUDES filter active, introduced
in 2.4.11. PR 57531. [Yann Ylavic]
Submitted By: ylavic
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668879 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:07:30 +0000 (13:07 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668878 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:06:47 +0000 (13:06 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668877 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:05:25 +0000 (13:05 +0000)]
tweak version # (doc got backported prematurely) and fix typos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668874 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 13:01:49 +0000 (13:01 +0000)]
Merge r1642484 from trunk:
Remove some instances where a RewriteBase must be specified
Previously, any time you used a relative substitution in
per-directory/htaccess context, you needed to specify
a RewriteBase. But in case where the context document root
and context prefix are known via e.g. mod_userdir
or mod_alias, and the substitution is under the context
document root, we can determine the replacement automatically.
This makes htaccess files or config snippets a bit more
portable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668870 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Mar 2015 12:54:04 +0000 (12:54 +0000)]
propose CGID intermittent startup problem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668868 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 24 Mar 2015 09:46:42 +0000 (09:46 +0000)]
* mod_lua: fix compilation with lua-5.3 (r1668827)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668831 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2015 11:24:01 +0000 (11:24 +0000)]
Withdraw timers duplicates for now, still being tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668592 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2015 08:54:01 +0000 (08:54 +0000)]
Follow up to fix for PR 57177.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668554 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2015 08:44:42 +0000 (08:44 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668548 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 Mar 2015 19:18:12 +0000 (19:18 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668450 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Mar 2015 14:13:26 +0000 (14:13 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668379 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 22 Mar 2015 14:12:51 +0000 (14:12 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1668378 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Mar 2015 16:30:36 +0000 (16:30 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1666712 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 14 Mar 2015 16:29:53 +0000 (16:29 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1666711 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 11 Mar 2015 22:13:53 +0000 (22:13 +0000)]
Fix doc as spotted by Sven in online doc.
r1666025 in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1666026 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Mar 2015 13:58:53 +0000 (13:58 +0000)]
vote/promote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665875 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 10:21:45 +0000 (10:21 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665832 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 10:21:02 +0000 (10:21 +0000)]
Revert r1665109 and comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665831 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 00:50:10 +0000 (00:50 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665750 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 00:43:51 +0000 (00:43 +0000)]
Easy vote :p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665748 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 11 Mar 2015 00:21:38 +0000 (00:21 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665745 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:58:10 +0000 (23:58 +0000)]
Update proposal according to CHANGES entry (r1665721).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665743 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:49:52 +0000 (23:49 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665742 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:24:34 +0000 (23:24 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665741 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:20:08 +0000 (23:20 +0000)]
Fix URL for PR 57358 fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665740 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:15:19 +0000 (23:15 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665739 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 23:08:14 +0000 (23:08 +0000)]
Wait for follow up to r1664356.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665738 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 10 Mar 2015 22:58:22 +0000 (22:58 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665737 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 10 Mar 2015 21:59:25 +0000 (21:59 +0000)]
Approve of this spec-compliance fix on both living released branches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665715 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 9 Mar 2015 21:44:41 +0000 (21:44 +0000)]
Comment on proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665368 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 13:40:02 +0000 (13:40 +0000)]
Propose fix for PR 56226 + PR 57374.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665231 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 12:58:40 +0000 (12:58 +0000)]
Propose fix for PR 55892.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665220 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 9 Mar 2015 08:29:23 +0000 (08:29 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665150 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 9 Mar 2015 01:42:29 +0000 (01:42 +0000)]
add revision, reset jim's vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1665109 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2015 15:21:35 +0000 (15:21 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664870 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 7 Mar 2015 15:20:45 +0000 (15:20 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664868 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 6 Mar 2015 10:15:42 +0000 (10:15 +0000)]
Suggestion, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664581 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:54:19 +0000 (14:54 +0000)]
Merge r1663017 from trunk:
mpm_event: follow up to r1538490, r1545736, r1604350, r1639614 and r1642868.
Clear and restore sbh in notify_suspend() and notify_resume() respectively.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664365 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:51:37 +0000 (14:51 +0000)]
Merge r1661258 from trunk:
mod_ssl: Add the SSL_CLIENT_CERT_RFC4523_CEA variable, which provides
a combination of certificate serialNumber and issuer as defined by
CertificateExactMatch in RFC4523.
Submitted by: minfrin
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664363 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:47:59 +0000 (14:47 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664361 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:47:16 +0000 (14:47 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664360 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 5 Mar 2015 14:46:14 +0000 (14:46 +0000)]
backport prop
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664359 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Mar 2015 02:34:42 +0000 (02:34 +0000)]
propose errordoc 400 CVE, switch another vote syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664207 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Mar 2015 19:18:27 +0000 (19:18 +0000)]
Merge r1657261 from trunk:
*) SECURITY: CVE-2015-0228 (cve.mitre.org)
mod_lua: A maliciously crafted websockets PING after a script
calls r:wsupgrade() can cause a child process crash.
[Edward Lu <Chaosed0 gmail.com>]
Discovered by Guido Vranken <guidovranken gmail.com>
Submitted by: Edward Lu
Committed by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664118 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 4 Mar 2015 19:17:32 +0000 (19:17 +0000)]
Merge r1657256 from trunk:
Fix bit-shifting of websockets frame fields that would yield wrong opcodes
when the FIN bit was set. Results in PING not being recognized
by mod_lua. PR57524
Submitted By: Edward Lu
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1664117 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 2 Mar 2015 20:41:07 +0000 (20:41 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663425 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 2 Mar 2015 19:44:30 +0000 (19:44 +0000)]
Update 2.4 patch to make reviewing easier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663409 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 2 Mar 2015 19:31:16 +0000 (19:31 +0000)]
Backport http://svn.apache.org/r1661913
ab: Add missing longest request (100%) to CSV export. PR57614.
Submitted by: ylavic
Reviewed by: covener, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663405 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 2 Mar 2015 19:28:51 +0000 (19:28 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663404 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 2 Mar 2015 19:24:17 +0000 (19:24 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663402 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 2 Mar 2015 19:15:24 +0000 (19:15 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663398 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Mar 2015 18:27:48 +0000 (18:27 +0000)]
some easy and pre-reviewed votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663391 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Mar 2015 18:26:14 +0000 (18:26 +0000)]
flip vote style in STATUS file
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663390 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Mar 2015 18:24:25 +0000 (18:24 +0000)]
propose stack overflow in lua websockets
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663389 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Mar 2015 11:12:18 +0000 (11:12 +0000)]
Merge r1656669 from trunk:
mod_macro: Clear macros before initialization to avoid use-after-free
on startup or restart when the module is linked statically. PR 57525
Submitted by: apache.org tech.futurequest.net
Committed by: Yann Ylavic
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663260 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Mar 2015 11:11:42 +0000 (11:11 +0000)]
Merge r1653941, r1653978, r1656225 from trunk:
mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.
Use unsigned bit fields.
mod_alias: follow up to r1653941.
Fill empty APLOGNO().
Submitted by: minfrin, ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663259 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Mar 2015 11:10:30 +0000 (11:10 +0000)]
Merge r1653997 from trunk:
mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).
Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663258 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Mar 2015 11:09:42 +0000 (11:09 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663257 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 2 Mar 2015 11:08:53 +0000 (11:08 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663256 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 1 Mar 2015 12:44:03 +0000 (12:44 +0000)]
Propose fix for PR57614.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663094 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 1 Mar 2015 01:39:17 +0000 (01:39 +0000)]
Propose missing merge from 2.4.11.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1663020 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Feb 2015 16:22:18 +0000 (16:22 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662961 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Feb 2015 16:21:19 +0000 (16:21 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662960 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 Feb 2015 06:20:49 +0000 (06:20 +0000)]
Follow up to r1662640
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662641 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 Feb 2015 06:18:31 +0000 (06:18 +0000)]
Merge r1644498 from trunk
* mod_ssl: Fix renegotiation failures redirected to an ErrorDocument.
(segfault flaw) PR 57334.
Submitted by: ylavic
Reviewed by: ylavic, wrowe, minfrin
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662640 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 27 Feb 2015 06:05:11 +0000 (06:05 +0000)]
Merge r1657692, r1660800 from trunk
* Save a few bytes in conf pool when parsing some directives. Use temp_pool
when applicable.
Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, covener
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662639 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Feb 2015 16:57:51 +0000 (16:57 +0000)]
Propose fix for PR57139.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662261 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Feb 2015 15:56:02 +0000 (15:56 +0000)]
Provide standalone 2.4.x patch for PR56872.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662249 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 25 Feb 2015 15:54:06 +0000 (15:54 +0000)]
Propose fix for PR56872.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662248 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 24 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge r1661067 from trunk:
mod_proxy_ajp: Forward SSL protocol name (SSLv3, TLSv1.1 etc.) as a
request attribute to the backend. The name is taken from
the SSL_PROTOCOL env var. Recent Tomcat versions will extract
it and provide it as a servlet request attribute named
"org.apache.tomcat.util.net.secure_protocol_version".
The change is compatible with existing AJP13, because we forward
the protocol name as a normal named attribute, not with a new
byte abbreviated attribute name.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662076 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 24 Feb 2015 18:25:26 +0000 (18:25 +0000)]
Merge r1657685 from trunk:
core: Optimize string concatenation in expression
parser when evaluating a string expression.
We have a relatively small recursion limit of
about 10 operations. This is a compilation
limit (a define). It can be hit if many expr
vars or function calls are concatenated in an
expression that is evaluated as a string not as
a boolean.
The new optimization uses iteration instead of
recursion and is very similar to the
existing one, which optimizes consecutive
concatenations in node2 of the tree. The new
one optimizes consecutive concatenations in
node 1.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662075 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Feb 2015 18:09:29 +0000 (18:09 +0000)]
extra newlines
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662071 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Feb 2015 18:09:00 +0000 (18:09 +0000)]
move systemd proposals to the stalled section. The patches on p.a.o are 5 months old.
Anyone who votes is free to move them back up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662070 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Feb 2015 18:04:47 +0000 (18:04 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662069 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 24 Feb 2015 17:40:47 +0000 (17:40 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662052 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Feb 2015 16:45:34 +0000 (16:45 +0000)]
xform
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662019 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Feb 2015 16:44:31 +0000 (16:44 +0000)]
Merge r1662012 from trunk:
improve some slightly awkward wording per comments feedback:
http://httpd.apache.org/docs/2.4/configuring.html#comment_3678
The original can be read as applying to comments on a subsequent line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1662015 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 24 Feb 2015 06:30:03 +0000 (06:30 +0000)]
Merge r1652930, r1652933 from trunk
* acinclude.m4: Generate #LoadModule directive in default httpd.conf for
every --enable-mpms-shared. PR 53882.
Submitted by: olli hauer <ohauer gmx.de>, Yann Ylavic
Reviewed by: ylavic, rjung, jailletc36
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661848 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 24 Feb 2015 06:22:22 +0000 (06:22 +0000)]
Merge r1611979, r1611725, r1588448, r1642803, r1657949, r1451108 (part of it),
r1643672, r1496178 from trunk
* Synch with trunk:
- Add missing APLOGNO.
- mod_deflate: don't require <limits.h> by using APR_INT32_MAX instead of INT_MAX.
- Move two variable assignments off the fast path.
- Fix curly braces style. Remove useless empty lines
- tab vs space
- Removed tabs.
- dump fcgi headers with trace8 instead of debug+compile-time flag.
- Drop severity of "LDAP: Setting referrals to ON" from DEBUG to TRACE4
Submitted by: jailletc36, ylavic, minfrin, fuankg, covener
Reviewed by: jailletc36, minfrin, ylavic
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661845 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Mon, 23 Feb 2015 19:17:10 +0000 (19:17 +0000)]
Fix a typo in CHANGES
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661754 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 Feb 2015 19:02:31 +0000 (19:02 +0000)]
Merge r1654184 from trunk:
as in r1517366, drop the severity in authz_groupfile when a require
didn't match but no real error was encountered.
This individual 'require group' may not really dictate who gets in. PR55523
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661749 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Feb 2015 16:02:57 +0000 (16:02 +0000)]
Vote/Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661707 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Feb 2015 09:49:58 +0000 (09:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661467 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Feb 2015 09:47:20 +0000 (09:47 +0000)]
Merge r1661464:
Mention notable things added in 2.4.x
Mention mod_macro, mod_wstunnel, mod_authnz_fcgi and a few other notable
features that were added post 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661466 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 22 Feb 2015 07:44:06 +0000 (07:44 +0000)]
Merge r1658567 from trunk
* mod_authn_dbd: Precedence issue. Fix the error message logged in case of
error while querying the database.
Submitted by: jailletc36
Reviewed by: jailletc36, mrumph, minfrin
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661456 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Feb 2015 17:21:24 +0000 (17:21 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661409 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Feb 2015 17:20:08 +0000 (17:20 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661408 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Feb 2015 10:51:41 +0000 (10:51 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661321 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 21 Feb 2015 09:20:19 +0000 (09:20 +0000)]
Merge r1656230 from trunk
* mod_proxy_connect: fix duplicated AH introduced by r1635645
(and merged to 2.4.11 in r1642857)
Submitted by: ylavic
Reviewed by: ylavic, jailletc36, minfrin
Backported by: jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661305 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 21 Feb 2015 07:11:54 +0000 (07:11 +0000)]
Fix an error 403 (file was missing :( )
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661296 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Feb 2015 00:59:46 +0000 (00:59 +0000)]
Noting that I get a 404 on the provided v2.4 patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661264 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 21 Feb 2015 00:57:49 +0000 (00:57 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1661263 13f79535 -47bb-0310-9956-
ffa450edef68