vote

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

Merge r1661448 from trunk:

core: Add expression support to ErrorDocument. Switch from a fixed
sized 664 byte array per merge to a hash table.

Submitted by: minfrin
Reviewed/backported by: jim

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

Merge r1666361 from trunk:

Avoid a potential integer underflow in the lock timeout value sent back to a client. The answer to a LOCK request could be an extremly large integer if the time needed to lock the resource was longer that the requested timeout given in the LOCK request. In such a case, we now answer "Second-0".  PR55420
Submitted by: jailletc36
Reviewed/backported by: jim

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

Remove proposal, it has already been applied in r1669920

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

two more

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

vote/promote

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

update transformation

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

backport "directive" placement option

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

Rebuild.

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

XML updates.

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

Fix ap_proxy_define_match_worker() proposal.

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

Correct MS-DOS check-in crap on text files

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

Merge r1667385 from trunk:

Retry ENOENT like ECONNREFUSED, but only near a server restart.

PR57685

Submitted By: Edward Lu
Committed By: covener

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1658760 from trunk:

mod_proxy_http: Don't expect the backend to ack the "Connection: close" to
finally close those not meant to be kept alive by SetEnv proxy-nokeepalive
or force-proxy-request-1.0, and respond with 502 instead of 400 if its
Connection header is invalid.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1665215, r1665218 from trunk:

mod_proxy: use the original (non absolute) form of the request-line's URI
for requests embedded in CONNECT payloads used to connect SSL backends via
a ProxyRemote forward-proxy. PR 55892.

Submitted by: Hendrik Harms <hendrik.harms gmail com>
Reviewed  by: wrowe, ylavic
Committed by: ylavic

mod_proxy: follow up to r1665215: CHANGES entry.
Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1619383, r1619444, r1662245, r1662246 from trunk:

A misplaced check for inflation limits prevented limiting relatively
small inputs.  PR56872

Submitted By: Edward Lu
Committed By: covener

mod_deflate: follow up to r1619383.

deflate_in_filter():
- use inflated bytes per inflate() call to compute the total output bytes,
- check zlib errors before limits,
- add missing check_ratio() when asked to flush.

deflate_out_filter():
- check ratio after each inflate() call.

mod_deflate: follow up to r1619383 and r1619444: CHANGES entry.

CHANGES: follow up to r1662245: Add PR number.
Submitted by: covener, ylavic, ylavic, ylavic
Reviewed/backported by: jim

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

imistakenly

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

promote

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

votes

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

Proposal

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

Votes.

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

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

Rebuild

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

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

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

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

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

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

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

xforms

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

xforms

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

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

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

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

* 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

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

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

Propose.

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

Propose

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML updates.

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

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

vote/promote/comment

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

Fix typo.

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

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

Vote and promote

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

Easy vote :p

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

Propose.

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

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

Propose.

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

Propose.

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

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

Propose.

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

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

Propose.

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

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

Comment on proposal

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

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

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

Vote.

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

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

Rebuild.

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

XML updates.

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

Suggestion, vote.

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

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

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

promote

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

votes

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

backport prop

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

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

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

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

Vote.

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

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

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

Vote and promote.

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

Vote.

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

Propose.

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

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

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

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

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

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

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

promote

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

votes

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

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

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

Rebuild.

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

XML updates.

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

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

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

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

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

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

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