Commits · 612c3dce46e6e5e245c9297f308df38425df52d5 · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

Jun 12, 2013

Jim Jagielski authored Jun 12, 2013

mod_cache_socache: Use the name of the socache implementation when performing 
a lookup rather than using the raw arguments.

Submitted by: minfrin
Reviewed/backported by: jim


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

612c3dce

Jun 10, 2013

core: Add dirwalk_stat hook. · 021ed051

Graham Leggett authored Jun 10, 2013

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

021ed051

core: Add post_perdir_config hook. · c3749244

Graham Leggett authored Jun 10, 2013

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

c3749244

proxy_util: NULL terminate the right buffer in 'send_http_connect' · 62f457f5

Graham Leggett authored Jun 10, 2013

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

62f457f5

mod_remoteip: close file in error path · 7a2e28b8

Graham Leggett authored Jun 10, 2013

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

7a2e28b8

Jun 07, 2013

mod_lua: Sync 2.4 branch with trunk. This includes (but is not limited to) · 3e15271b

Graham Leggett authored Jun 07, 2013

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

3e15271b

core: make the "default" parameter of the "ErrorDocument" option case insensitive. · e7e7fd23

Graham Leggett authored Jun 07, 2013

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

e7e7fd23

mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive. · 1557130f

Graham Leggett authored Jun 07, 2013

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

1557130f

mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR 54462 · f37065b5

Graham Leggett authored Jun 07, 2013

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

f37065b5

May 28, 2013

mod_cache: If a 304 response indicates an entity not currently cached, then · efe3db81

Graham Leggett authored May 28, 2013

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

efe3db81

mod_cache: Ensure that we don't attempt to replace a cached response · ce37b9b9

Graham Leggett authored May 28, 2013

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

ce37b9b9

core, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions() · 9d32840b

Graham Leggett authored May 28, 2013

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

9d32840b

core: Add the ability to do explicit matching on weak and strong ETags · 26118258

Graham Leggett authored May 28, 2013

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

26118258

mod_cache: Ensure that updated responses to HEAD requests don't get · 2106f78d

Graham Leggett authored May 28, 2013

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

2106f78d

mod_cache: Honour Cache-Control: no-store in a request. · 6db1b214

Graham Leggett authored May 28, 2013

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

6db1b214

mod_cache: Make sure that contradictory entity headers present in a 304 · 51864dcf

Graham Leggett authored May 28, 2013

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

51864dcf

mod_cache: Make sure Vary processing handles multivalued Vary headers and · 78a6c7f6

Graham Leggett authored May 28, 2013

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

78a6c7f6

mod_cache: When serving from cache, only the last header of a multivalued · 976d6f90

Graham Leggett authored May 28, 2013

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

976d6f90

mod_cache: Ignore response headers specified by no-cache=header and · cc3f3e64

Graham Leggett authored May 28, 2013

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

cc3f3e64

mod_cache: Invalidate cached entities in response to RFC2616 Section · b747a29b

Graham Leggett authored May 28, 2013

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

b747a29b

May 26, 2013

mod_dav: Improve error handling in dav_method_put(), add new · 8acdfcc3

Graham Leggett authored May 26, 2013

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

8acdfcc3

mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with · f2262be1

Graham Leggett authored May 26, 2013

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

f2262be1

mod_dav: Do not fail PROPPATCH when prop namespace is not known. PR 52559 · 8b024299

Graham Leggett authored May 26, 2013

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

8b024299

mod_dav: When a PROPPATCH attempts to remove a non-existent dead · 67182d72

Graham Leggett authored May 26, 2013

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

67182d72

mod_dav: Sending a If or If-Match header with an invalid ETag doesn't · 4a7ac0c5

Graham Leggett authored May 26, 2013

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

4a7ac0c5

mod_dav: Make sure that when we prepare an If URL for Etag comparison, · a07a5ffa

Graham Leggett authored May 26, 2013

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

a07a5ffa

May 23, 2013

mod_authn_file, mod_authz_groupfile: remove an unused and undocumented · 61147342

Graham Leggett authored May 23, 2013

"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

61147342

core: Do not over allocate memory within 'ap_rgetline_core' for the common case. · 55bfde06

Graham Leggett authored May 23, 2013

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

55bfde06

core: speed up (for common cases) and reduce memory usage of ap_escape_logitem · 4243c58c

Graham Leggett authored May 23, 2013

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

4243c58c

mod_dav: Ensure URI is correctly uriencoded on return. PR 54611 · 4ca580a8

Graham Leggett authored May 23, 2013

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

4ca580a8

Merge r1481306 from trunk: · 7f208098

Jim Jagielski authored May 23, 2013

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

7f208098

Merge r1481302, r1481397 from trunk: · 2913225d

Jim Jagielski authored May 23, 2013

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

2913225d

Merge r1479216 from trunk: · 46051e54

Jim Jagielski authored May 23, 2013

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

46051e54

Merge r1425874, r1426850 from trunk: · 3a0c3cf9

Jim Jagielski authored May 23, 2013

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

3a0c3cf9

May 15, 2013

core: Use the proper macro for HTTP/1.1. · 20e9bee1

Graham Leggett authored May 15, 2013

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

20e9bee1

May 12, 2013

event MPM: Provide error handling for ThreadStackSize. PR 54311 · f5f84448

Graham Leggett authored May 12, 2013

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

f5f84448

mod_dav: Do not segfault on PROPFIND with a zero length DBM. PR 52559 · c1977441

Graham Leggett authored May 12, 2013

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

c1977441

core: Improve error message where client's request-line exceeds LimitRequestLine · be84ff3b

Graham Leggett authored May 12, 2013

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

be84ff3b

May 06, 2013

mention mod_macro in CHANGES and add compatibility note · b6ceeda0

Stefan Fritsch authored May 06, 2013


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

b6ceeda0

May 05, 2013

- Wording improvemennt (I hope so) · 9472922d

Rainer Jung authored May 05, 2013

- 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

9472922d