Vote and patch

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

propose proxy regression fix

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

remove trailing whitespace: no functional change

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

Documentation rebuild

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

Merge r1782140 from trunk:

Add debugging info to the HttpProtocolOption directive doc

In bugzilla and users@ we keep receiving questions about
how to test the new restrictions imposed by HttpProtocolOptions.
Added some info about how to use openssl s_client properly
and the mod_dumpio's directives to debug (thanks to
Daniel Ferradal for this suggestion).

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

Merged.

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

Merge r1684636 from trunk:

* mod_auth_digest: Use anonymous shm by default, fall back on name-based.

Submitted by: jkaluza
Reviewed by: jorton, ylavic, jim

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

Votes

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update - UTF-8 conversion.

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

Add a comment

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

Update backport proposal with latest trunk work

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

UTF-8 conversion.

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

Rebuild.

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

XML updates.

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

Adding .fr translation for howto/http2

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

2*merged.

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

Merge r1726705 from trunk:

mod_filter: Fix AddOutputFilterByType with non-content-level filters.
PR: 58856

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

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

Merge r1778319,r1778331 from trunk:

Use pconf as parent pool so mutexes get cleaned on restarts/reloads

name changes re: suggestion

Submitted by: jim
Reviewed by: jim, jorton, ylavic

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

Update proposals (r1781188, now reverted/splitted, was referenced in both).

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

* Comment

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

Propose.

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

Propose.

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

Vote, promote.

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

Propose.

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

Update proposal.

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

Documentation rebuild

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

Merge r1780907, r1780918 from trunk:

Add more info about the role of Timeout for mod_cgi

PR 60404 asks if the Timeout directive is related to
the amount of time to wait for the entire CGI script's
output or only the first byte received.
Checking in mod_cgi.c -> cgi_bucket_read shows a
apr_pollset_poll that should support the latter.

Reworded the Timeout documentation about mod_cgi[d]

After a chat with Yann and Eric on dev@, we agreed to
simplify the description.

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

Reviews.

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

mod_remoteip comment.

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

Propose r1684636.

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

Conversion to UTF-8.

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

make a note about regressin reported by jorton

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

Rebuild.

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

Bad meta file.

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

Rebuild.

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

XML updates.

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

On the 2.4.x branch:

Merge of r1779979,1780159,1780576,1780596 from trunk:
M    modules/http2/h2_bucket_beam.c
     fix for possible duplicate free of send/recv pools
M    modules/http2/h2_from_h1.c
     suppress generating responses on aborted slave connections
M    modules/http2/h2_session.c
     regression: stream ongoing streams on graceful shutdown to the end
M    modules/http2/h2_version.h

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

documentation rebuild

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

Add HTTP/2 howto link to index and sitemap

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

documentation rebuild

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

Correct some typos across the documentation.

This commit was made thanks to the tool and PR
created by Lajos Veres (vlajos) on github.

PR: https://github.com/apache/httpd/pull/6
Tool: https://github.com/vlajos/misspell_fixer

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

Documentation rebuild

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

Merge r1779927 from trunk:

Reworked and added examples to the HTTPProtocolOptions doc

On #httpd-dev a user gave us some hints about what kind of
things would have been great to see in the HTTPProtocolOptions
directive's documentation, so I tried to apply them all.

I also added some examples taken from http_strict.t and tested
a bit. I didn't follow completely the complete change-set of
the HTTPProtocolOptions directive, so please review the change
and let me know if anything is wrong or missing.

Submitted by: elukey

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

Merge r1779578, r1779609 from trunk:

Added more details to mod-proxy-http2's doc

Reworked mod-proxy-http2's documentation after Stefan's suggestions

Submitted by: elukey

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

On the 2.4.x branch:

Merge r1779743,1779896,1779972 from trunk.

mod_http2: fixes PR60599, sending proper response for conditional requests
answered by mod_cache. [Jeff Wheelhouse, Stefan Eissing]

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

On the 2.4.x branch: merge r1778630,1779459,1779525,1779528,1779738 from trunk

  *) mod_http2: rework of stream resource cleanup to avoid a crash in a close
     of a lingering connection. Prohibit special file bucket beaming for
     shared buckets. Files sent in stream output now use the stream pool
     as read buffer, reducing memory footprint of connections.
     [Yann Ylavic, Stefan Eissing]

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

Should be in next release

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

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