Use r->hostname

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

oops2

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

oops

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

mod_h2
Via: svn merge -r10:HEAD https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2

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

Sync

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705681 13f79535-47bb-0310-9956-ffa450edef68

Merge r1697855, r1697339, r1696428, r1696266, r1696264, r1695874, r1695727, r1692516, r1692486, r1610674, r1685069, r1693918, r1698116, r1698133, r1694950, r1700968, r1701005, r1701145, r1701178 from trunk:

adding ap_get_protocol(c) which safeguards against NULL returns, for use instead of direct calling ap_run_protocol_get

changed Protocols to let vhosts override servers, removed old H2Engine example from readme

creating ap_array_index in util, forwarding scheme into request processing, enabling SSL vars only when scheme is not http:, delayed connection creation until task worker assignment

removed unnecessary lingering_close and sbh update on end of protocol upgrade handling

introducing ap_array_index in util, used in protocol and mod_h2

fixes existing protocol missing in selection if not explicitly proposed

new directive ProtocolsHonorOrder, added documentation for Protocols feature, changed preference selection and config merging

removed accidental code

new Protocols directive and core API changes to enable protocol switching on HTTP Upgrade or ALPN, implemented in mod_ssl and mod_h2

SECURITY (CVE-2014-0117): Fix a crash in mod_proxy.  In a reverse
proxy configuration, a remote attacker could send a carefully crafted
request which could crash a server process, resulting in denial of
service.

Thanks to Marek Kroemeke working with HP's Zero Day Initiative for
reporting this issue.

* server/util.c (ap_parse_token_list_strict): New function.

* modules/proxy/proxy_util.c (find_conn_headers): Use it here.

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
  Send a 400 for a malformed Connection header.

Submitted by: Edward Lu, breser, covener

http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code
for clients requesting a hostname on a reused connection whose SNI (from the
TLS handshake) does not match.
PR 5802.

This allows HTTP/2 clients to fall back to a new connection as per:
https://tools.ietf.org/html/rfc7540#section-9.1.2

Proposed by: Stefan Eissing <stefan eissing.org>
Reviewed by: ylavic

c89

Allowing protocol_propose hooks to be called with offers=NULL, clarifying semantics as proposed by chaosed0@gmail.com

giving ap_array_index a start parameter, adding ap_array_contains

ap_process_request needs exportation for use in mod_h2 on Windows

final final change to the new ap_array_str_* functions after review

changed Protocols default to http/1.1 only, updated documentation, changed ap_select_protocol() to return NULL when no protocol could be agreed upon

mod_ssl: fix compiler warning (bad cast).

improvements in ap_select_protocol(), supplied by yann ylavic
Submitted by: icing, jorton, ylavic, covener, icing, icing, gsmith, icing, icing, ylavic, icing
Reviewed/backported by: jim

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

Note mod_h2 is RTC exception

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

Merge r1705099, r1705134 from trunk:

Don't count initial handshake I/O when determining the first byte.
PR58454

Submitted By: Konstantin J. Chernov
Committed By: covener

Avoid storing request stuff in r->connection->conn_config to
avoid problems with e.g. write completion.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1704099 from trunk:

Fix a spurious test where a condition is always true:
      if ((cfg->skipto != NULL) && (ctx->flags | ENC_SKIPTO)) {
                                    ^^^^^^^^^^^^^^^^^^^^^^^

This is apparently harmless because, in 'xml2enc_filter_init', the ENC_SKIPTO bit of 'flags' is set to ENC_SKIPTO if 'skipto' is non-NULL.
Submitted by: jailletc36
Reviewed/backported by: jim

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

Vote.

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

Vote/promote mod_h2, what about "experimental" bits?

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

Vote, promote.

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

propose update

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

merged current 2.4.x and ap_mmn.h update by minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1705628 13f79535-47bb-0310-9956-ffa450edef68

Compatibility issue?

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

Fix typo in proposal.

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

Propose follow up to r1705492.

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

Fix availability version for 'ListenCoresBucketsRatio'.

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

OK

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

Add a comment.

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

mod_cache: r->err_headers_out is not merged into
r->headers when mod_cache is enabled and the response
is cached for the first time.

Submitted by: elu
Reviewed by: ylavic, minfrin

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

Vote and promote.

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

Propose MMN bump.

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

mod_slotmem_shm: Fix slots/SHM files names on restart for systems that
can't create new (clear) slots while previous children gracefully stopping
still use the old ones (e.g. Windows, OS2). PR 58024.

Submitted by: ylavic
Reviewed by: jim, minfrin

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

Vote and promote.

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

util_script: Make REDIRECT_URL a complete URL (where set).
PR 57785

Submitted by: niq
Reviewed by: jim, minfrin

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

Vote and promote.

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

We need docs...

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

Update transformations.

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

MPMs: Support SO_REUSEPORT to create multiple duplicated listener
records for scalability.

Submitted by: Yingqi Lu <yingqi.lu@intel.com>, Jeff Trawick,
              Jim Jagielski, Yann Ylavic

Reviewed by: ylavic, jim, minfrin

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

Vote, promote.

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

Vote.

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

Vote.

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

Vote.

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

Proposal.

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

propose a few PR-related mod_ssl backports

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

Propose

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

update transformation

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

Fix typo in comment
(r1380525 on trunk)

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

add fix for abuse of per-connection module config

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

propose logio PR

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

Vote.

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

Merge r1664709, r1697323 from trunk:

 * Do not reset the retry timeout if the worker is in error at this stage even
   if the connection to the backend was successful. It was likely set into
   error by a different thread / process in parallel e.g. for a timeout or
   bad status. We should respect this and should not continue with a connection
   via this worker even if we got one.

* Do a more complete cleanup here. At this point we cannot end up with something useful with the data we created so far.
Submitted by: rpluem
Reviewed/backported by: jim

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

promote

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

vote and demote

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

latest changes from branches/2.4.x, merged --enable-http2 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704828 13f79535-47bb-0310-9956-ffa450edef68

merged race condition fix and versoin bump from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704801 13f79535-47bb-0310-9956-ffa450edef68

remove unused var 'np'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704714 13f79535-47bb-0310-9956-ffa450edef68

Propose

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

merged latest session shutdown changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1704265 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

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

XML updates.

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

merged 1703871 by Yann for SNI misdirect handling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703994 13f79535-47bb-0310-9956-ffa450edef68

Propose mod_proxy fixes.

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

merged latest branches/2.4.x changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703838 13f79535-47bb-0310-9956-ffa450edef68

merged yann's patch to fix MISDIRECTED_REQUEST handling

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703826 13f79535-47bb-0310-9956-ffa450edef68

Merge r1703417, r1703642 from trunk:

Add in finding LUA installed via Macports and others

accept both 5.1 and 5.2, so make messages clear

Reviewed/backported by: jim

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

Backport

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

Backport req

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

Merge r1700851 from trunk:

mod_negotiation: simplify type-map body tag lookup, and be safe
should it contain a NUL byte.

Submitted by: ylavic
Reviewed/backported by: jim

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

Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:

Core filters do not need mod_proxy.h

Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables

Save a few bytes in conf pool

Remove some spaces between some return statements  and ';' + fix a strange formating in a 'for' loop

In order to save a few cycles, delay a hash table lookup which is not necessary needed

Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim

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

Merge r1701436 from trunk:

allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.

Submitted by: covener
Reviewed/backported by: jim

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

Merge r1701545 from trunk:

Improve macro definition in order to avoid potential precedence issues.

For example, sparse spotted that the following line was spurious:
        newcond->flags &= ~CONDFLAG_NOCASE;
It this particular case, 2 bits were resetted (instead of only 1). This was harmless because the first bit (i.e. CONDFLAG_NONE) is never tested as-is.
Submitted by: jailletc36
Reviewed/backported by: jim

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

promote

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

vote

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

remove unwanted/needed merge remnants
change base address

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703270 13f79535-47bb-0310-9956-ffa450edef68

fix a missed C&P error in comment
add a missing piece needed for command line build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703269 13f79535-47bb-0310-9956-ffa450edef68

Votes.

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

Propose mod_slotmem_shm/mpm_winnt fixes.

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

adding 1703152 to fix ProtocolsHonorOrder description

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703159 13f79535-47bb-0310-9956-ffa450edef68

Update easy proposals

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

Easy proposals

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

merge of current 2.4.x and change 1702919

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1702925 13f79535-47bb-0310-9956-ffa450edef68

Rebuild.

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

XML updates.

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

update mod_ssl transformations

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

link to the OpenSSL 1.0.2 version of the SSL_CONF_cmd man page

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

Andy Wang says lots of fishy things here

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

Rebuild

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

Applies patch from info@mathijs.info to use 2.4 authz syntax.

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

propose old trunk patch

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

merged latest changes in 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701801 13f79535-47bb-0310-9956-ffa450edef68

Merge r1700317, r1700318, r1700319, r1700320, r1700321, r1700322, r1700326, r1700328, r1700330, r1700331, r1700332, r1700334, r1700336, r1700338 from trunk:

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting

Silence a sparse warning about inconsistent indenting + some minor style issues

Remove useless line

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues

Fix some spurious ident spotted by sparse

Silence a sparse warning about inconsistent indenting + some minor style issues

Silence a sparse warning about inconsistent indenting + some minor style issues
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1696105, r1700418 from trunk:

With the current implementation, it is likely to connect/close a socket with the memcache server for each command sent.
The root cause is a too small idle timeout (600 microseconds).

Add a new directive, 'MemcacheConnTTL',  to control this idle connection timeout with the memcache server(s).
Change the default value from 600 usec (!) to 15 sec as per Yann suggestion.

I've limited accepted values from 1 to 1800 seconds (half an hour) because internaly, the value passed to 'apr_memcache_server_create' is still in mirco-seconds.

PR 58091
~~~~~~~~~~~~~~~~~~~_
Homemade measurement (on a slighly modified version of httpd) shows a +30% in number of processed requests using memcache to cache /index.html.
Comparison made between the 600 usec and 15 sec TTL.

Memcache config:
    default
httpd Config:
    CacheEnable socache /
    CacheSocache memcache:127.0.0.1
    LoadModule mpm_event_module modules/mod_mpm_event.so
httpd compiled with:
    ./configure --enable-mpms-shared=all --with-included-apr --with-mysql --with-libxml2 --enable-modules=reallyall --enable-ssl-ct=no --enable-maintainer-mode --prefix=$HOME/httpd-2.5
httpd and memcache running on the same VM running under Ubuntu 15.04
Load tested using:
    ab -n 20000 http://127.0.0.1/index.html

Creation/closing of connections beetween httpd and memcache confirmed using the telnet connection to memcache and the stats command

Allow 0 as a valid value (never close idle connections)
Increased maximum allowed value to 3600 s (1 hour)
Use 'ap_timeout_parameter_parse' to allow more flexible configuration (i.e. h, min, s, ms suffixes)
Use 'apr_time_from_sec' when applicable.
Submitted by: jailletc36
Reviewed/backported by: jim

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

added 1701347, re-merged with current 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701759 13f79535-47bb-0310-9956-ffa450edef68

updated http2 backport proposal with own branch reference

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

merge of protocols + http2 relevant changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701655 13f79535-47bb-0310-9956-ffa450edef68

transient branch to bring Protocols feature and mod_h2 into 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1701609 13f79535-47bb-0310-9956-ffa450edef68

Vote.

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

Update proposal

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

vote for alternative fix

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

remove old flavor of ALPN proposal, new ALPN/Protols is now proposed.

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

some easy votes/promotes

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

Add CHANGES entry

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

autoindex fix w/o mod_mime and mod_dir

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

Merge r1597352 from trunk:

* Give ap_proxy_post_request as chance to act correctly on the status code
  by setting r->status temporarily to access_status. r->status might be
  different than access_status e.g. r->status could be HTTP_OK if e.g. we
  override the error page on the proxy or if the error was not generated
  by the backend itself but by the proxy e.g. a bad gateway.

Submitted by: rpluem
Reviewed/backported by: jim

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

  *) mod_session_dbd: fix lifetime of Request notes.
       trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?r1=1679181&r2=1687087&view=patch
            2.4.x: trunk patch applies.
                 +1: niq, ylavic, jim

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

Merge r1693963 from trunk:

Allow cookies set by mod_rewrite to contain ':' by accepting
';' as an alternate separator.  PR47241.

Submitted By: <bugzilla schermesser com>, covener
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@1701409 13f79535-47bb-0310-9956-ffa450edef68

Merge r1693919 from trunk:

Add HTTPD_VERSION and HTTPD_MMN to the variables available with apxs -q

PR58202.

Submitted By: Daniel Shahaf
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@1701408 13f79535-47bb-0310-9956-ffa450edef68

promote

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