vote/promote

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

mod_lua backport: Make httpd find lua 5.2 headers/lib during configure if present on the system (mod_lua is fully compatible with 5.2).

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

votes

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

200-700% CPU during post-body-across-LAN testcase without
the busy-loop patch, 3.6-4.7% CPU with the busy-loop patch

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

Comments.

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

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1605010 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@1605009 13f79535-47bb-0310-9956-ffa450edef68

fixed build

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

a few more votes

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

remove proposal, this block of code is removed in 2.4 now and Rainer
agreed in the thread following r1583175

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

Merge r1604631 from trunk:

Follow up to r1604336: Comment out hooks whose only references are
now commented out, fixing a "-Wunused-function" warning

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

Rebuild.

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

XML update.

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

XML Update.

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

Rebuild.

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

XML updates.

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

Add some compatibilty notes for some options of "support" applications

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

Vote for r1604350.

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

Merge r1604461 from trunk:

Follow-up to r1601076: Provide documentation for -m option.

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

silly typo

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

Merge r1572092 from trunk:

mod_deflate: fix decompression of files larger than 4GB. According to RFC1952,
Input SIZE (compLen) contains the size of the original input data modulo 2^32.

PR: 56062
Submitted by: Lukas Bezdicka
Reviewed by: jkaluza, ylavic, covener

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

Merge r1572655, r1572663, r1572668, r1572669, r1572670, r1572671, r1573224, r1586745, r1587594, r1587639, r1590509 from trunk.

Commit 1 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate output filter :
- add the new deflate_ctx_t fields needed to re-enter the Zlib header parsing,
- introduce the new consume_zlib_flags() function to parse/consume the ZLib flags (will be used by the other filters too),
- use it to handle incomplete header in the output filter (deflate).

This alone fixes PR 55666, but the issue remains for PR 46146 (inflate/deflate input filters), hence the following patches.

Commit 2 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib header buffering in the inflate input filter :
- loop until all the header is received,
- handle non blocking reads returning empty brigade,
- fix a double ap_get_brigade() when an EOS brigade is encountered while reading the header,
- in that case and no data was received so far, don't return an error but SUCCESS with the EOS, otherwise fail,
- don't remove the Content-Length and Content-MD5 headers until some data is read.

Still does not handle Zlib flags for now, next commits.

Commit 3 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib validation bytes buffering (CRC + length) in the inflate input filter :
- use validation_buffer and validation_length as state,
- loop until all the bytes are received.

Commit 4 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle non blocking reads which would block in the inflate input filter (not an error).

Commit 5 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Handle Zlib flags in the inflate input filter as in the output filter, using consume_zlib_flags().

Commit 6 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters.
PR 46146 (patches from duplicated PR 55666)

Ignore empty buckets and split buckets longer than INT_MAX (since zlib uses 32-bit ints only) in all filters.

mod_deflate: when consuming zlibs flags, APR_INCOMPLETE implies no more bytes available.

mod_deflate: update empty log tags.

mod_deflate: Delay INFLATE input filter's self removal until all the buffered
             buckets are out (including EOS). PR 46146.

mod_deflate: Don't return gzip-ed data when reading FLUSH bucket in INFLATE
             input filter, forward the FLUSH but keep reading should EOS/more
             follow (should not happen, but mod_deflate won't fix it).

mod_deflate: follow up to r1587639.
Don't break the looped brigade when moving the FLUSH bucket to the returned bb
and continue reading.

Reviewed by: ylavic, jim, covener

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

doc xforms

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

Merge r1604382 from trunk:

Follow up r1573626 with some wordsmithing, a compatibility note,
and indentation.

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

Merge r1573626 from trunk:

mod_proxy: Allow reverse-proxy to be set via explicit handler.

Submitted by: ryo takatsuki <ryotakatsuki gmail com>
Reviewed by: ylavic, jim, mrumph

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

Merge r1601076 from trunk:

ab: support custom HTTP method with -m argument.

PR: 56604
Submitted by: Roman Jurkov <winfinit gmail.com>
Reviewed by: ylavic, trawick, covener

(r1601680 and r1601700 not reflected in mergeinfo due to
a collision with an unrelated trunk change)

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

merge 1592032 from trunk:

mod_proxy_fcgi: better error messages, and fix an old bug where the error
                condition was forgotten

Submitted by: trawick
Reviewed by: ylavic, covener

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

promotions

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

votes and more votes

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

propose another fix unsafe c->sbh = NULL

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

mod_lua: Backport disabling of early/late in LuaHookCheckUserID

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

mod_lua: Sync 2.4.x with trunk (more or less); Backport a fix and some code harmonization:
- IVM changed to use shm
- More verbose error logging (no functional change)
- Miscellaneous refactoring that was in trunk but not in 2.4.x (no functional change as such)

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

Trivial 2.4.x vs trunk synch.
Stray whitespace (r1602730 in trunk)

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

Vote on mod_proxy proposal.

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

Add CHANGES entries to mod_deflate proposals.

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

r1592032 doesn't merge cleanly anymore, so provide a patch

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

Merge r1572905, r1595305, r1597182, r1586827, r1534892, r1563193, r1597639 from trunk:

core: avoid a double apr_time_now() call on the first succeeding read.

* Correctly escape user provided data.

PR: 56532
Submitted by: Maksymilian <max cert.cx>
Reviewed by: rpluem

Save a few bytes of memory. This can be done in temp_pool.

Fix layout

don't pass uninitialized rv passed to ap_log_rerror()
  (rv wasn't interesting / follow an existing example)

stop throwing away a pointer on the heap

(clang scan-build)

add the URI to DEBUG message 00765 (and drop an exclamation point):

  Cache provider's store_body failed!

Doxygen fix + reorg to match how other header files are built
Submitted by: ylavic, rpluem, jailletc36, jailletc36, trawick, covener, jailletc36
Reviewed/backported by: jim

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

Merge r1603027, r1603029, r1603122 from trunk:

Fix bug introduced in r1591508 which resulted in the final empty
FCGI_STDIN not being sent.  Interaction with latest uWSGI (and
probably other protocol implementations) breaks without this.

Reindent after small fix in r1603027

mod_proxy_fcgi: follow up to r1592032.

Also break the outer loop when "sending stdin" fails.

Submitted by: trawick, ylavic
Reviewed/backported by: jim

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

promote

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

votes

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

Votes.

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

Thanks, Yann!

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

Notes about mod_proxy_fcgi fixes.

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

Update UDS connect() proposal and vote.

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

trawick is being an idiot again.

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

Rebuild html

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

Example of loading an MPM with LoadModule, and what error you get when
you do it wrong.

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

rebuild

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

Markup errors.

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

<page> not valid in this context.

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

More relevant links in the getting started doc.

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

Build HTML

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

Remove ancient IE-on-Mac example.

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

Rebuild.

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

XML updates.

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

Rebuil.

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

XML updates.

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

update transformations

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

update Japanese translation
(simply copy from trunk except revision ref)

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

update Japanese translation

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

vote+note

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

better mod_proxy_fcgi error messages perhaps?

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

merge r1591508 from trunk:

mod_proxy_fcgi: Support iobuffersize parameter.

Submitted by: trawick
Reviewed by: jim, ylavic

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

Fix ab (custom method) proposal.

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

Propose SSL shutdown fixes on both ends (client/backend).

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

Vote, promote.

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

Proposals

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

Merge r1601532 from trunk:

simplify/clarify that negation operates on an entire condition and not
on the regex or the special test conditions. Comment #1291.

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

r1599852 and r1599799 in trunk
Fix broken URL in comment

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

r1553485.
Comment fix

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

generated changes

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

Fix spelling and grammar errors

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

generated changes

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

Remove redundant paragraph and fix grammar errors.

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

generated changes

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

Fix spelling and grammar errors.

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

Generated doc files.

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

Fix r1593664 where I miss read the code and what is performed in "header_inout_cmd()" where arguments are "shuffled" according to the "action" to be performed.

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

New mod_proxy proposals.

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

Add some missing changes.

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

Hmmm... wasn't added w/ the patch :/

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

Merge r1546730, r1583008, r1571369, r1552130, r1578760, r1592615, r1592632, r1595321, r1550302, r1550307, r1585435 from trunk:

fix whitespace in a debug message

s/comment/self-documenting/

normalize an ugly construct which somehow manages to return the correct value

This is annoying to see in a casual "LogLevel debug foo:traceX ..."

Use 'apr_table_setn' instead of 'apr_table_set' when possible in order to save memory.

Follow-up to r1592529:

Define default port for "scgi" schemes (as chosen by
mod_proxy_scgi) in a common location.

Suggested by: jailletc36

fix Doxygen markup error

Submitted by: jailletc36

Tweak a AP_DEBUG_ASSERT condition.
Valid index to use 'req_header_var_names' are 0...6

mod_auth_form: Add a debug message when the fields on a form are not
recognised.

mod_auth_form: Make the trace logging consistent through the notes, session
and form authentication steps.

mod_auth_form: update empty log tags.
Submitted by: trawick, covener, jailletc36, trawick, trawick, jailletc36, minfrin, minfrin, ylavic
Reviewed/backported by: jim

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

Propose r1599486.

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

Promote.

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

Fix layout in previous commit

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

AcceptFilter has two parameters + syntax highlight
See r1397602 on trunk

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

Rebuild.

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

XML Updates.

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

Merge r1592511, r1592514 from trunk:

reformat only (get rid of unnecessary block scope)

Clarify an existing requirement of the server_portstr parameter
to ap_proxy_determine_connection(): it must be a buffer of at
least one byte in size.

(And don't bother with using strcpy in order to zap a string.)

Submitted by: trawick
Reviewed/backported by: jim

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

Merge r1591328, r1594643, r1594648 from trunk:

mod_cache: Preserve non-cacheable headers forwarded from an origin 304
           response. PR 55547.

When mod_cache asks for a revalidation of a stale entry and the origin responds
with a 304 (not that stale), the module strips the non-cacheable headers from
the origin response and merges the stale headers to update the cache.

The problem is that mod_cache won't forward the non-cacheable headers to the
client, for example if the 304 response contains both Set-Cookie and
'Cache-Control: no-cache="Set-Cookie"' headers, or CacheIgnoreHeaders is used.

mod_cache: follow up to r1591328.

Define the cache_merge_headers_out() function to merge r->err_headers_out into
r->headers_out and add the ones from r->content_type/encoding if available.
Use it in ap_cache_cacheable_headers_out() where the same is done and in
cache_save_filter() where this has to be done before updating the entry.

mod_cache: follow up to r1594643.

Avoid table lookup if not necessary (fast path first).

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1594625 from trunk:

mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.
                    PR55320.

Submitted by: Alex Liu <alex.leo.ca gmail.com>
Committed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

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

xforms

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

promote (more this weekend)

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

votes

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

update Japanese translation
(simply copy from trunk except revision ref)

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

Rebuild.

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

XML Update.

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

Rebuild.

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

XML updates.

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

Merge r1560683 and r1581011 from trunk:

(mod/mod_proxy_express.xml)
It does more than just a ProxyPass, but also looks at the HOST header,
so this gives somewhat deeper insight into what the end result looks
like.

(mod/mod_proxy_connect.xml)
a comma leaked onto the page

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