Checkout Tools
  • last updated 30 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge of r1851146 from trunk:

*) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with

an URL that contains a :port.

PR 53915 [Rein Tollevik <rein basefarm.no>]

  1. … 2 more files in changeset.
Merge r1783842 from trunk:

mod_cache: Fix a regression in 2.4.25 for the forward proxy case by

computing and using the same entity key according to when the cache

checks, loads and saves the request. PR 60577.

Submitted by: ylavic

  1. … 6 more files in changeset.
Merge r1496711, r1597533, r1649491, r1665216, r1756553, r1756631, r1726675, r1718496, r1718476, r1747469 from trunk:

recognize the "default handler name" in r->handler, which is used when

no SetHandler/AddHandler and no matching mimetype during type_checker.

Submitted by: Eric Covener

mod_cache: try to use the key of a possible open but stale cache entry

if we have one in cache_try_lock(). PR 50317

Submitted by: Ruediger Pluem

* modules/cache/mod_socache_memcache.c (socache_mc_store): Pass

through expiration time.

Submitted by: Faidon Liambotis <paravoid debian.org>, jorton

* mod_cache: Preserve the Content-Type in case of 304 response.

304 does not contain Content-Type and mod_mime regenerates

the Content-Type based on the r->filename. This later leads to original

Content-Type to be lost (overwriten by whatever mod_mime generates).

mod_cache: Use the actual URI path and query-string for identifying the

cached entity (key), such that rewrites are taken into account when

running afterwards (CacheQuickHandler off). PR 21935.

mod_cache: follow up to r1756553: log the real/actual cached URI (debug).

better s-maxage support

+ *) mod_cache: Consider Cache-Control: s-maxage in expiration

+ calculations. [Eric Covener]

+

+ *) mod_cache: Allow caching of responses with an Expires header

+ in the past that also has Cache-Control: max-age or s-maxage.

+ PR55156. [Eric Covener]

remove dead code leftover from r1023387.

Prior to this revision, there was an apr_atoi64 in this context.

Now, ap_cache_control() sets control.max_age (which is checked here) when

the maxage value was parsed OK.

duplicate debug-level AH00764 in the just-validated path.

Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen

Submitted by: jkaluza, jorton, jkaluza, ylavic, ylavic, covener, covener, covener, wrowe

Reviewed/backported by: jim

  1. … 10 more files in changeset.
Merge r1705983 from trunk:

Fix some style issues on files that can easily be synch'ed with 2.4.x

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 17 more files in changeset.
Merge r1487528, r1563379, r1563381, r1565711 from trunk:

* server/protocol.c (r_flush): Use int return type as per declaration

of apr_vformatter(); no functional change.

Use %pm in order to save 8k of stack in 'ap_pcfg_strerror'

s/apr_pstrndup/apr_pstrmemdup/ when applicable

follow-up to r1096569:

remove unnecessary total_modules calculation

Submitted by: jorton, jailletc36, jailletc36, trawick

Reviewed/backported by: jim

  1. … 5 more files in changeset.
Merge r1523235 from trunk:

mod_cache: Avoid a crash with strcmp() when the hostname is not provided.

Submitted by: minfrin

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Merge r1491564 from trunk:

const goodness with nasty strrchr and strchr functions

(resolve warning in maintainer mode)

Submitted by: trawick

Reviewed/backported by: jim

  1. … 2 more files in changeset.
core, mod_cache: Ensure RFC2616 compliance in ap_meets_conditions()

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

  1. … 8 more files in changeset.
mod_cache: Honour Cache-Control: no-store in a request.

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

  1. … 6 more files in changeset.
mod_cache: Make sure Vary processing handles multivalued Vary headers and

multivalued headers referred to via Vary.

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

Submitted by: minfrin

Reviewed by: jim, wrowe

  1. … 5 more files in changeset.
mod_cache: When serving from cache, only the last header of a multivalued

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

  1. … 3 more files in changeset.
mod_cache: Invalidate cached entities in response to RFC2616 Section

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

  1. … 9 more files in changeset.
Merge r1452281 from trunk:

cache_storage: remove useless test + update function name in debug log + skip as soon as we know headers do not match

Submitted by: jailletc36

Reviewed/backported by: jim

  1. … 2 more files in changeset.
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG

to TRACE1-3

  1. … 164 more files in changeset.
  1. … 6 more files in changeset.