trunk patch: http://svn.apache.org/r1388447
Submitted by: trawick
Reviewed by: minfrin, jim, sf


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

trunk patch: http://svn.apache.org/r1368121
Submitted by: minfrin
Reviewed by: jim, sf


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

trunk patch: http://svn.apache.org/r1490994
Submitted by: jailletc36
Reviewed by: covener, minfrin


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

trunk patch: http://svn.apache.org/r1491234
Submitted by: jailletc36
Reviewed by: covener, minfrin


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

Server pools, new apr functions for the request_rec table, input/output filters,
LuaCodeCache, LuaMapHandler and multipart form data handling. This is long
overdue, and has become too spaghetti-ish to propose in chunks :|

trunk patch: http://svn.apache.org/r1366890
             http://svn.apache.org/r1367025
             http://svn.apache.org/r1367040
             http://svn.apache.org/r1367048
             http://svn.apache.org/r1383024
             http://svn.apache.org/r1383028
             http://svn.apache.org/r1383037
             http://svn.apache.org/r1367725
             http://svn.apache.org/r1367875
             http://svn.apache.org/r1368109
             http://svn.apache.org/r1369656
             http://svn.apache.org/r1369793
             http://svn.apache.org/r1369800
             http://svn.apache.org/r1370158
             http://svn.apache.org/r1433967
             http://svn.apache.org/r1429169
             http://svn.apache.org/r1425450
             http://svn.apache.org/r1425243
             http://svn.apache.org/r1422552
             http://svn.apache.org/r1422548
             http://svn.apache.org/r1422531
             http://svn.apache.org/r1422373
             http://svn.apache.org/r1422072
             http://svn.apache.org/r1421784
             http://svn.apache.org/r1421780
             (the list goes on...)
    2.4.x patch: http://www.humbedooh.com/mod_lua_sync.patch (+CHANGES)

Submitted by: humbedooh
Reviewed by: jim, covener, fuankg


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

PR 54419

trunk patch: http://svn.apache.org/r1465190
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin


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

PR 54420

trunk patch: http://svn.apache.org/r1464762
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin


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

trunk patch: http://svn.apache.org/r1464721
Submitted by: Tianyin Xu <tixu cs ucsd edu>
Reviewed by: jailletc36, fuankg, minfrin


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

the cache MUST disregard the response and repeat the request without the
conditional.

trunk patch: http://svn.apache.org/r1481197
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-uncacheable304-2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

with an older response as per RFC2616 13.12.

trunk patch: http://svn.apache.org/r1479966
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-olderdate2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

with weak validation combined with If-Range and Range headers. Break
out explicit conditional header checks to be useable elsewhere in the
server. Ensure weak validation RFC compliance in the byteranges filter.
Ensure RFC validation compliance when serving cached entities. PR 16142

trunk patch: http://svn.apache.org/r1479905
2.4.x patch: http://people.apache.org/~minfrin/httpd-if-range-fix2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

as per RFC2616 Section 13.3.3.

trunk patch: http://svn.apache.org/r1479528

Submitted by: minfrin
Reviewed by: jim, wrowe


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

mistakenly paired with a previously cached body. Ensure that any existing
body is removed when a HEAD request is cached.

trunk patch: http://svn.apache.org/r1479411

Submitted by: minfrin
Reviewed by: jim, wrowe


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

trunk patch: http://svn.apache.org/r1479222
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-nostore2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

Not Modified response are caught and cause the entity to be removed.

trunk patch: http://svn.apache.org/r1479117
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-304sanity.patch2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

multivalued headers referred to via Vary.

trunk patch: http://svn.apache.org/r1478748

Submitted by: minfrin
Reviewed by: jim, wrowe


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

header was taken into account. Fixed. Ensure that Warning headers are correctly
handled as per RFC2616.

trunk patch: http://svn.apache.org/r1478441
             http://svn.apache.org/r1480283
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-multipleheaders2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

private=header as specified by RFC2616 14.9.1 What is Cacheable. Ensure
that these headers are still processed when multiple Cache-Control
headers are present in the response. PR 54706

trunk patch: http://svn.apache.org/r1478382
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-nocacheheader2.4.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

13.10 Invalidation After Updates or Deletions. PR 15868

trunk patch: http://svn.apache.org/r1070179
             http://svn.apache.org/r1478140
             http://svn.apache.org/r1478173
             http://svn.apache.org/r1478798
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_cache-invalidate7.patch

Submitted by: minfrin
Reviewed by: jim, wrowe


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

dav_join_error() function.  PR 54145.

trunk patch: http://svn.apache.org/r1464241
2.4.x patch: http://people.apache.org/~minfrin/httpd-mod_dav-errorhandling.patch
Submitted by: Ben Reser <ben reser.org>
Reviewed by: minfrin, jim, jorton


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

the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.

trunk patch: http://svn.apache.org/r1485668
Submitted by: Ben Reser <ben reser.org>
Reviewed by: minfrin, covener, jorton


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

trunk patch: http://svn.apache.org/r1476644
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, jim, jorton


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

property on a resource for which there is no dead property in the same
namespace httpd segfaults. PR 52559

trunk patch: http://svn.apache.org/r1476642
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, jim, jorton


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

result in a 412 Precondition Failed. PR54610

trunk patch: http://svn.apache.org/r1476604
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, jorton


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

we compare unencoded paths. PR 53910

trunk patch: http://svn.apache.org/r1470940
             http://svn.apache.org/r1477530
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, jorton


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

"standard" optional parameter for 'AuthGroupFile' and 'AuthUserFile'

trunk patch: http://svn.apache.org/r1484398
Submitted by: jailletc36
Reviewed by: covener, minfrin


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

trunk patch: http://svn.apache.org/r1483005
Submitted by: jailletc36
Reviewed by: jim, minfrin


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

This should save 70-100 bytes in the request pool for a default config.

trunk patch: http://svn.apache.org/r1485409
Submitted by: jailletc36
Reviewed by: jim, covener


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

trunk patch: http://svn.apache.org/r1476621
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, covener


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

PR54948: wildcard name-based vhosts printed twice in apachectl -S


Submitted by: covener
Reviewed/backported by: jim


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

mod_proxy: Reject invalid values for Max-Forwards.


Adjust format string

type was changed by r1481302

Submitted by: minfrin, sf
Reviewed/backported by: jim


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

mod_cache: RFC2616 14.9.3 The s-maxage directive also implies the
semantics of the proxy-revalidate directive.

Submitted by: minfrin
Reviewed/backported by: jim


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

mod_ssl: add support for subjectAltName-based host name checking in proxy mode
(PR 54030)

factor out code from ssl_engine_init.c:ssl_check_public_cert()
to ssl_util_ssl.c:SSL_X509_match_name()

introduce new SSLProxyCheckPeerName directive, which should eventually
obsolete SSLProxyCheckPeerCN

ssl_engine_io.c:ssl_io_filter_handshake(): avoid code duplication
when aborting with HTTP_BAD_GATEWAY


Fix warning about discarding 'const' qualifier from pointer

Submitted by: kbrand, sf
Reviewed/backported by: jim


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

trunk patch: http://svn.apache.org/r1482996
Submitted by: minfrin
Reviewed by: covener, jailletc36


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

trunk patch: http://svn.apache.org/r1433682
Submitted by: Tianyin Xu <tixu cs.ucsd.edu>
Reviewed by: minfrin, jailletc36, sf


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

trunk patch: http://svn.apache.org/r1476645
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, covener, sf


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

PR 54384

trunk patch: http://svn.apache.org/r1433613
Submitted by: jailletc36
Reviewed by: minfrin, jim


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

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

- Add forgotten MD5 in apr_expr change.


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

Merge r1305167, r1330964, r1388660, r1388899, r1391396, r1391398, r1392214, r1406760, r1418648 from trunk:

Update transformations.


syntax for mod_b*.xml and mod_c*.xml

mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.


Windows build for mod_cache_socache added in r1388660


Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin


Apply proper APLOGNO codes for mod_cache_socache.


Added mod_cache_socache to NetWare build.


* Ensure that nkey is initialized.

mod_cache_socache: Don't clean up too soon. If we do, revalidated requests
lose their bodies.

Submitted by: minfrin, humbedooh, minfrin, gsmith, minfrin, minfrin, fuankg, rpluem, minfrin
Reviewed/backported by: jim


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