Rebuild.

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

XML updates.

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

As per http://httpd.apache.org/docs/2.4/programs/httpd.html#comment_6187
the -R option has been gone for ages.

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

mod_brotli backport

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

Add showstopper for 2.4.x PHP-FPM breakage

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

Rebuild.

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

XML update.

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

update transformation

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

Rebuild.

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

XML updates.

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

On the 2.4.x branch: merge of r1701609-1705681 from trunk.

  *) mod_http2: streaming of request output now reacts timely to data
     from other streams becoming available. Same for new incoming requests.

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

Update w/ name change

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

Backport proposal

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

Merge r1777460, r1777672 from trunk:

http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).

http: follow up to r1777460.
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.
Submitted by: ylavic
Reviewed by: ylavic, covener, wrowe

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

  *) mod_auth_digest: Reduce severity from NOTICE to DEBUG this
      once-per-restart msg (I guess the concern was that the RNG
          could block after this message)
                AH01757: generating secret for digest authentication ...
                    trunk patch: This was fixed in trunk as a trivial part of http://svn.apache.org/r1492395
                        2.4.x patch: Just change the loglevel to DEBUG.
                            +1: covener, jim, wrowe

Submitted by: covener
Reviewed by: covener, jim, wrowe

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

Merge r1775487 from trunk:

fix crash in util_fcgi.c

 *) mod_proxy_fcgi, mod_fcgid: Fix crashes in ap_fcgi_encoded_env_len() when
    modules add empty environment variables to the request. PR60275.
    [<alex2grad AT gmail.com>]

Submitted By: <alex2grad AT gmail.com>]
Committed By: covener

Submitted by: covener
Reviewed by: covener, jim, wrowe

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

** NOTE: the vendor states "This mitigation has been assigned the identifier
CVE-2016-5387"; in other words, this is not a CVE ID for a vulnerability. **

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

Upvote and promote 3 patches, note one being-worked, as yet unworkable backport

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

Merge r1775775 from trunk:

mod_proxy_{ajp,fcgi}: Fix a possible crash when reusing an established
backend connection, happening with LogLevel trace2 or higher configured,
or at any log level with compilers not detected as C99 compliant (e.g.
MSVC on Windows).

Submitted by: ylavic
Reviewed by: ylavic, jim, covener

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML updates.

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

Fix some style issue in mod_lua (which is not under RTC)
(r1772490 in trunk)

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

Synch with trunk - remove trailing spaces

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

some easy votes

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

Update, per dev@ review.

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

Fix typo in comment
(r1739569 in trunk)

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

Propose.

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

On the 2.4.x branch: merge of r1776738,1777160,1777324 from trunk

backport of latest mod_http2 related changes.

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

rebuild

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

Add cross references

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

Oh yeah

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

note 2.4.24 was not released in CHANGES too.

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

Fix a typo spotted in an old comment + synch with trunk (trailing space)

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

xforms

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

Fix a typo in an example (missing ")
The typo is already fixed in trunk

+ synch a bit with trunk (tab vs space, trailing space)

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

Xforms.

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

Happy New Year 2017

Backport of r1776956 from trunk.

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

Update proposal with reference to trunk commit

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

On the 2.4.x branch, merge of r1775946,1776735 from trunk:

mod_http2: adding support for MergeTrailers directive.

mod_http2: limiting DATA frame sizes by TLS record sizes in use on the
    connection. Flushing outgoing frames earlier.

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

Documentation rebuild - part 2

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

Documentation rebuild

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

Fixed some doc typos detected by a user.

Sébastien Santoro (dereckson AT espace-win.org)
sent a bug report about one typo in core.xml
and I executed the aspell tool on the whole file.

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

propose PR58856 fix

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

Looks like this entry was added to the wrong section

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

Note additional trunk patch for RemoteIPProxyProtocol

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

Update reference to patch to match shorter name in trunk

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

Better formatting of proposal

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

Propose PROXY protocol support

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

Propose backport

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

xforms

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

Fix translation.

Because of the missing upper case, "La documentation de cette directive n'a pas encore t traduite. Veuillez vous reporter la version en langue anglaise." is displayed.

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

xforms

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

Fix old comment from Martijn

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

On the 2.4.x branch:

mod_http2: removing debug logs leftover in previous commit

* modules/http2/h2_bucket_beam.c
 removed log warnings from debug session

Modified:
   httpd/httpd/trunk/modules/http2/h2_bucket_beam.c

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

On the 2.4.x branch: merge of r1775833 from trunk:

Cleanup mod_http2 beamer registry on server reload. Fixes PR60510.

* modules/http2/h2_bucket_beam.c
  register cleanup function on installation that NULLs the beamer
  registry on pool cleanup.

Patch by: Pavel Mateja <pavel@verotel.cz
         me

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

Merge r1775770 from trunk:

pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.com>
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@1775832 13f79535-47bb-0310-9956-ffa450edef68

promote

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

vote

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

Merge r1775195 from trunk:

http_header_filter: on check_headers() failure, use AP_FILTER_ERROR and EOC
semantics to respectively warn the caller and cleanly terminate the connection
afterwards.

Suggested by: rpluem

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1775199, r1775664 from trunk:

Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.

remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1775173 from trunk:

Silence compiler warning:
"686: warning: 'ok' may be used uninitialized in
this function"
This is a false positive, because the value of "ok"
will only be used if stapling_get_cached_response()
sets "rsp" to non-NULL in which case it will always
have set "ok".

Submitted by: rjung
Reviewed/backported by: jim

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

Merge r1741570 from trunk:

* Silence compiler warning
Submitted by: rpluem
Reviewed/backported by: jim

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

On the 2.4.x branch:

mod_http2: version bump after backport

* modules/http2/h2_version.h: increased version number

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

On the 2.4.x branch:

Merge r1775813 from trunk:

Fix mod_h2/github issue #126: correct lifetime of data sent on temp pools

* modules/http2/h2_bucket_beam.c
 - ignore send pools that are sub-pools of the existing one
 - added h2_beam_send_from() to allow explicit registering of the
   correct pool for the sending

* modules/http2/h2_bucket_beam.h
 - add prototype for h2_beam_send_from()

* modules/http2/h2_mplx.c
 - adding logging of output beam state

* modules/http2/h2_stream.c
 - register stream pool for sending data on input beam

* modules/http2/h2_task.c
 - register task pool on output beam on creation
 - adding trace logging

* modules/http2/h2_proxy_session.c
 - fixing a type in a comment while we're at it

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

Vote, Promote.

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

Propose.

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

propose ext_filter fix

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

solid morning... votes

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

axe the check entirely

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

fcgi patch

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

* Add proposal

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

update viewvc shortcut

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

ebcdic fix

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

assign logno from trunk

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

Propose.

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

Propose.

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

Rebuild.

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

XML update.

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

Fix exported .mak output of mod_socache_memcache for '../generators' dependency

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

and we are now 2.4.26-dev

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

Roll on 2.4.25

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

Merge r1774609 from trunk:

Add ../generators to include path for Windows
build of mod_socache_memcache. It now needs
mod_status.h.

Untested but exactly analogous to what works for
mod_socache_shmcb and others.

Submitted by: rjung
Reviewed/backported by: jim

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

note CHANGES

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

Merge r1706595 from trunk:

Follow-up to r1702948:

APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)

This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1774602 from trunk:

Use correct format pattern, "%lu" is wrong for
apr_uint64_t on some platforms.

Followup to r1649491.

Submitted by: rjung
Reviewed/backported by: jim

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

Vote, promote.

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

vote...

and Good Catch!

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

And another proposal.

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

Some votes

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

Propose.

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

Propose simple fix observed during 2.4.24
test builds.

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

xforms

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

And we are 2.4.25-dev

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

Get ready to tag 2.4.24

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

revoke

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

Propose.

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

Note.

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

kill 'em early

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