Rebuild.

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

XML updates.

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

documentation rebuild

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

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

Proposal

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

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

combine duplicates

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

NOTE CVEs

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

smash dup

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

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

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

xform

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

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

xform

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

more tags

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

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

xforms

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

no longer experimental

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

xforms

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

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

Fix Typo.

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

Rebuild.

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

XML updates.

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

xforms

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

correct release

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

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

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

typo

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

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

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

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

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

Fix typo.

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

xforms

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

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

backported in r1797651

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

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

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

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

promote

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

votes

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

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

Propose

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

Propose

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

Vote.

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

propose

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

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

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

Vote (+promote), comment.

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

Propose

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

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

vote

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

vote and promote

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

fix typo

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

Note show-stopper

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

Good catch

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

wstunnel vote

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

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

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

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

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

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

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

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

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

promote

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

votes

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

Synch with trunk.
Backport r1575391 in order to describe =~ and !~

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

Propose.

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

Merge r1796493 from trunk:

ab: enable option processing for setting a custom
HTTP method also for non-SSL builds.

Submitted by: rjung
Reviewed by: rjung, covener, gsmith

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

Propose.

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

copypasta error on r1796522, still needs a vote

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

Vote, promote.

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

vote/promote

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

Fix dead link and synch with trunk

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

Quick vote.

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

vote

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

Improve proposal text.

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

Propose trivial ab patch.

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

Add a missing ':'

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

propose

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

revert r1796447, this should be RTC.

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

add CHANGES meant for r1788447

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

bad conflict edit in r1796447

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

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>

(CTR for EBCDIC fix)

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

Rebuild.

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

XML updates.

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

propose test_char fix

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

propose ap_get_basic_auth_pw for 2.4

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

propose + 2 straightforward votes

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

rebuild

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

fix confusing indentation of examples

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

Documentation rebuild

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

Merge r1796135 from trunk:

Remove warning about nested If/ElseIf/Else evaluation

As noted by Christophe Jaillet in the dev@ ml nested
if/elseif/else conditions are now evaluated. The code
change has been already backported to 2.4.x.

Submitted by: elukey

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

xforms

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

Backport r1772559, r1774492, r1774493, r1774505 + reorder section/module in order to synch with trunk.

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

This was for some reason not folded in during the larger patchset,
which had been approved and committed.

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

Merge r1795830 from trunk:

ab: don't call malloc_init for OpenSSL 1.1.0

Patch by rjung.

The 1.1.0 compatibility macro for OpenSSL_malloc_init() causes problems
when mixed with procedure linkage stubs with some toolchains (e.g. GCC).
OpenSSL's malloc implementation doesn't recognize that the PLT stub
points back to it, which leads to infinite recursion.

Since the 1.1.0 documentation states that calling this function
explicitly is no longer necessary except "in certain shared-library
situations"(?), get rid of it.
Submitted by: jchampion
Reviewed by: jchampion, ylavic, gsmith

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

Merge r1792589 from trunk:

Evaluate nested If/ElseIf/Else config sections

It has been reported multiple times that nested
If/ElseIf/Else sections are not evaluated but
silently ignored.

This patch adds a simple recursion to the ap_if_walk
logic in order to allow arbitrary nested configs.
The overhead seems negligible compared to the actual
version of the ap_if_walk, but more expert feedback
is surely needed since this code gets called for every
HTTP request.

Tests are going to be added to t/apache/if_sections.t

Submitted by: elukey
Reviewed by: elukey, jim, yalvic

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

Proposal

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