* 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).

fix another case of 304 response sent to an unconditional request

mod_cache: avoid unlikely access to freed memory.

Fix typo in comment.

don't let handlers start with r->status = 304 during a failed revalidation PR56881

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 r1591390 Fix code typo.

mod_cache: follow up to r1591322 Avoid one unnecessary test when checking 304 contradictions.

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 r1591320. Use the new MOD_CACHE_ENTITY_HEADERS[] names to check 304 contradictions against the same headers.

mod_cache: Don't add cached/revalidated entity headers to a 304 response. PR 55547. When the conditional request meets the conditions of the stale then revalidated entry, the forwarded 304 response includes the entity headers merged from the cached headers (before updating the entry). Strip them before returning a 304. Since the entity headers are stripped elsewhere, factorize the code using a new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.

Revert r1591312 (again) to commit the 2 fixes separately.

mod_cache: Don't add cached/revalidated entity headers to a 304 response. PR 55547. When the conditional request meets the conditions of the stale then revalidated entry, the forwarded 304 response includes the entity headers merged from the cached headers (before updating the entry). Strip them before returning a 304. Since the entity headers are stripped elsewhere, factorize the code using a new table (MOD_CACHE_ENTITY_HEADERS[]) containing these headers's names.

mod_cache: Retry unconditional request with the full URL (including the query-string) when the origin server's 304 response does not match the conditions used to revalidate the stale entry. http://www.mail-archive.com/dev@httpd.apache.org/msg59884.html

Fix layout

leave a warning about cc_out

add the URI to DEBUG message 00765 (and drop an exclamation point): Cache provider's store_body failed!

Expires in a 304 is not a contradiction in terms of r1487118: - Expires, Cache-Control, and/or Vary, if the field-value might differ from that sent in any previous response for the same variant

reflow a very long line, no functional change

fix whitespace in AH00766 warning: s/all of theinput/all of the input/

update log tags replace duplicate, add missing

mod_cache: If a 304 response indicates an entity not currently cached, then the cache MUST disregard the response and repeat the request without the conditional.

Ensure that Warning headers are correctly handled as per RFC2616.

mod_cache: Ensure that we don't attempt to replace a cached response with an older response as per RFC2616 13.12.

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

mod_cache: Ensure that updated responses to HEAD requests don't get mistakenly paired with a previously cached body. Ensure that any existing body is removed when a HEAD request is cached.

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

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

mod_cache: Make sure that contradictory entity headers present in a 304 Not Modified response are caught and cause the entity to be removed.

mod_cache: When serving from cache, only the last header of a multivalued header was taken into account. Fixed.

mod_cache: Ignore response headers specified by no-cache=header and 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

Apply log message tags to messages.

mod_cache: Invalidate cached entities in response to RFC2616 Section 13.10 Invalidation After Updates or Deletions. PR 15868 Resolves outstanding issue with r1070179 as per http://www.gossamer-threads.com/lists/apache/dev/395830?do=post_view_threaded#395830

Make option "CacheDisable" in mod_cache case insensitive. PR 54462 reported by Tianyin Xu [tixu cs ucsd edu]

Cache does no longer send Content-Type header for fresh content. Followup to r1361153+r1373447 (PR 53539, wrong Content-Type for stale content).

The following now respects DefaultRuntimeDir/DEFAULT_REL_RUNTIMEDIR: - mod_cache: thundering herd lock directory

Wrong content type and character set when mod_cache serves stale content because of a proxy error. PR 53539. Correction to r1361153.

* Set content type in case we return stale content.

Fix various filter functions to return apr_status_t instead of int

mod_cache: Remove ap_cache_liststr(), it duplicates ap_find_token().

Add lots of unique tags to error log messages

Use varargs...

Use ap_pass_brigade_fchk()

value never used: dead assignment

mod_cache: Make sure we merge headers correctly when we handle a non cacheable conditional response. PR52120.

mod_cache: Ensure that CacheDisable can correctly appear within a LocationMatch.

mod_cache: Fix the moving of the CACHE filter, which erroneously stood down if the original filter was not added by configuration.

mod_cache: Ensure that r->content_type is set when serving stale content in response to a failed attempt to revalidate.

mod_cache: Clarify which scenario we have present, quick handler on and CACHE filter present, which is an error, or the CACHE filter being present when the cache is bypassed, which is business as usual.

Both lastmod and lastmods resolve to 0 when unset, but only lastmods is a pointer. Fix comparison between apr_time_t and NULL.

mod_cache: When content is served stale, and there is no means to revalidate the content using ETag or Last-Modified, and we have mandated no stale-on-error behaviour, stand down and don't cache. Saves a cache write that will never be read.

mod_cache: Make CacheEnable and CacheDisable configurable per directory in addition to per server, making them work from within a LocationMatch.

mod_cache: When a request other than GET or HEAD arrives, we must invalidate existing cache entities as per RFC2616 13.10. PR 15868.

mod_cache: Make sure that the moving of the CACHE filter to another point within a subrequest is limited to affecting filters in that subrequest only.

mod_cache: When a bad Expires date is present, we need to behave as if the Expires is in the past, not as if the Expires is missing. PR 16521.

Further trivial updates mod_disk_cache -> mod_cache_disk. No functional change.

Fix a spelling mistake.

Fix a spelling mistake.

mod_cache: Respect the original Cache-Control header if no header arrives with a 304 Not Modified.

Be compliant with RFC2616 14.46, revalidation failed is Warning 111, not Warning 110.

Remove the remove_url filter consistently for both the ap_die() and the mod_proxy cases.

Use ap_log_rerror() instead of ap_log_error() across mod_cache and mod_disk_cache.

Support Cache-Control: only-if-cached, as per RFC2616 14.9.4.

Add support for proxy-revalidate as per RFC2616 section 14.9.4.

Fix the sense of the must_revalidate comparison. Replace a further call to ap_cache_liststr() with a pre-parsed value.

Complete the optimisation of Cache-Control header parsing. Make the cache_control_t structure public so as to be available to mod_disk_cache.

mod_cache: Support stale-on-error behaviour for the mod_proxy case in addition to the existing case where the error was generated by ourselves.

Make sure we remove the cache lock consistently as soon as we've started down the error path, so that we don't delay the next attempt to cache.

Restore the apr_brigade_insert_file() call to within recall_body(), as the function does more than add a single file bucket. Pass an empty brigade to recall_body(), and prepend the result to the existing output brigade, the next bucket being eos.

mod_cache: Optionally serve stale data when a revalidation returns a 5xx response, controlled by the CacheStaleOnError directive.

Use the more popular spelling variant.

Fix the lookup of the per-directory cache config, we were looking up the per-server config instead.

Remove the attempt to pass the cache key into the lock functions, use cache->key instead for this. Fixes a segfault caused when cache->key was populated, but the passed in key was not.

mod_cache: Allow control over the base URL of reverse proxied requests using the CacheKeyBaseURL directive, so that the cache key can be calculated from the endpoint URL instead of the server URL.

Realign the cache_quick_handler() and cache_handler() to behave identically to the default_handler() when it comes to reacting to errors when writing to the filter stack. Previously the error message implied the cache had failed, when in reality, any part of the filter stack may have returned an error.

Remove FIXMEs, they have been fixed.

mod_cache: CacheLastModifiedFactor, CacheStoreNoStore, CacheStorePrivate, CacheStoreExpired, CacheIgnoreNoLastMod, CacheDefaultExpire, CacheMinExpire and CacheMaxExpire can be set per directory/location.

mod_cache: Support the caching of HEAD requests.

mod_cache: Make sure that we never allow a 304 Not Modified response that we asked for to leak to the client should the 304 response be uncacheable. PR45341

mod_cache: Add the cache_status hook to register the final cache decision hit/miss/revalidate. Add optional support for an X-Cache and/or an X-Cache-Detail header to add the cache status to the response. PR48241

Make ap_cache_accept_headers, ap_cache_accept_headers, ap_cache_try_lock and ap_cache_check_freshness private.

Remove the MOD_CACHE_REQUEST_REC hack, and pass the cache_request_rec structure through mod_cache's function parameters in the usual way.

Revert breakage in 2.2.4 introduced in r450055, by offering a CacheStoreExpired directive to allow the user to override this questionable change.

Move private cache_* declarations out of the public mod_cache.h file.

mod_cache: Give the cache provider the opportunity to choose to cache or not cache based on the buckets present in the brigade, such as the presence of a FILE bucket.

mod_cache: Add a discrete commit_entity() provider function within the mod_cache provider interface which is called to indicate to the provider that caching is complete, giving the provider the opportunity to commit temporary files permanently to the cache in an atomic fashion. Move all "rename" functionality of temporary files to permanent files within mod_disk_cache from ad hoc locations in the code to the commit_entity() function. Instead of reusing the same variables for temporary file handling in mod_disk_cache, introduce separate discrete structures for each of the three cache file types, the headers file, vary file and data file, so that the atomic rename of all three file types within commit_entity() becomes possible. Replace the inconsistent use of error cleanups with a formal set of pool cleanups attached to a subpool, which is destroyed on error.

mod_cache: Change the signature of the store_body() provider function within the mod_cache provider interface to support an "in" brigade and an "out" brigade instead of just a single input brigade. This gives a cache provider the option to consume only part of the brigade passed to it, rather than the whole brigade as was required before. This fixes an out of memory and a request timeout condition that would occur when the original document was a large file. Update the mod_disk_cache provider implementation to take into account the new API. Introduce CacheReadSize and CacheReadTime directives to mod_disk_cache to control the amount of data to attempt to cache before sending the data on to the client in the "out" brigade.

remove unused variables

mod_cache: Use a proper filter context to hold filter data instead of misusing the per-request configuration. Fixes a segfault on trunk when the normal handler is used.

- Remove a load of unused variables (or variables that are set but never read). - Move some declarations into the correct #ifdef scope. I couldn't compile/test netware, but the changes look obvious enough.

mod_cache: Explicitly allow cache implementations to cache a 206 Partial Response if they so choose to do so. Previously an attempt to cache a 206 was arbitrarily allowed if the response contained an Expires or Cache-Control header, and arbitrarily denied if both headers were missing.

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

Fix a bug where if the cache quick handler is switched off, and the CACHE filter is manually added by the admin, but caching has not been enabled for the URL space, an attempt is made to remove the CACHE_SAVE filter instead of the CACHE filter. This fix makes the code work like the comment above the code, the comment being correct.

* Do NOT cache 206 responses in any case since we don't (yet) know how to cache partial responses. Fixes regression of r724093. PR: 49113

use ap_strchr_c to protect const-ness of input string (and thus quiet gcc in maintainer mode)

mod_cache: add Cache-control: s-maxage to cacheability decisions per RFC 2616.

mod_cache: Teach CacheEnable and CacheDisable to work from within a Location section, in line with how ProxyPass works.

Back out r818492 which prevented all caching of incomplete responses. Instead move the check to mod_disk_cache. This leaves cache implementations the flexibility to implement caching of incomplete responses. PR: 15866

Ensure that we call ap_meets_conditions() in the mod_cache normal handler case, so that conditional requests are handled properly.

Remove an unused variable.

mod_cache: Introduce the option to run the cache from within the normal request handler, and to allow fine grained control over where in the filter chain content is cached.

* Use strcasecmp instead of strncasecmp as we want to be sure that the whole word is None and not only the beginning. Noted by Jeff Trawick

mod_cache: don't cache incomplete responses, per RFC 2616, 13.8. PR: 15866

Axe an unused variable.

Log the return code in the debug message to properly indicate why the lock could not be obtained.

Reintroduce an optimisation lost in some cut and paste. The cache lock is removed as soon as we see an EOS, or is removed immediately if a failure has occurred.

mod_cache: Introduce the thundering herd lock, a mechanism to keep the flood of requests at bay that strike a backend webserver as a cached entity goes stale.

* Use the correct constant.

* Add CacheIgnoreURLSessionIdentifiers directive to ignore defined session identifiers encoded in the URL when caching.

look for 'no-cache' in subprocess_env to prevent the saving of an otherwise cacheable response.

When an expires or cache-control header are sent, the RFC does allow us to cache normally non-cacheable response statuses. Submitted by: Alex Polvi <alex polvi.net>

Centralize the error-header collapsing done when sending out cached replies. Mark the change in CHANGES as it may have unforseen fall out and/or may need to be reverted or done more subtle.

* Style police. No functional changes.

Centralize hop-by-hop header handling in the main mod_cache code. This change is a no-op -- i.e. we call the same code path as prior to the API renaming. However this is propably wrong; and we should have been cleansing the content-types all along

Remove all references to CORE_PRIVATE.

* Restore the original request headers if the cached resource was stale, as they may be needed by further output filters like the byterange filter to make the correct decisions. PR: 44579

mod_cache: Do not set Date or Expires when they are missing from the original response or are invalid.

mod_cache: Correctly handle HEAD requests on expired cache content. PR 41230. * modules/cache/mod_cache.c (cache_save_filter): Properly handle HEAD responses when we have a stale handle. (This patch was revised by Justin/Ruediger.) Submitted by: Niklas Edmundsson Reviewed by: Justin, Ruediger

mod_cache: Let Cache-Control max-age set the expiration of the cached representation if Expires is not set. * modules/cache/mod_cache.c (cache_save_filter): If Cache-Control max-age is set and Expires isn't, let that value control our expiration.

RFC 2616 13.2.1 calls out max-age as being a valid 'explicit expiration time', so per Sec. 13.9 permit queries with just max-age instead of only Expires. * modules/cache/mod_cache.c (cache_save_filter): Be closer to RFC 2616's intent for query arguments. * CHANGES: Update.

* Add CacheIgnoreQueryString directive to cache requests with a query string even if no expiration time is specified. Futhermore the query string will not be used for key generation such that requests to the same URI path, but with different query strings are mapped to the same cache entity. Turning this setting to ON violates RFC 2616/13.9 and thus it is turned off by default. PR: 41484 Submitted by: Fredrik Widlund <fredrik.widlund qbrick.com> Reviewed by: rpluem

This time from the top, with three part harmony AND feeling... Revert the read-while-caching and large-file-crash fixes for mod_disk_cache, ready to start again. Reverted: r450105 r450188 r462571 r462601 r462696 r467655 r467684 r468044 r468373 r468409 r470455

whitespace fix

* Use the query string stored in r->parsed_uri.query instead of r->args as r->args could have been changed (e.g. via mod_rewrite) after the quick handler hook. This causes resources to be stored under a key, where they cannot be fetched again in the quick handler. PR: 40805

mod_cache: Pass the output filter stack through the store_body() hook, giving each cache backend the ability to make a better decision as to how it will allocate the tasks of writing to the cache and writing to the network. Previously the write to the cache task needed to be complete before the same brigade was written to the network, and this caused timing and memory issues on large cached files. This fix replaces the previous fix for PR39380.

Revert the splitting of buckets before they are handed to the cache providers, a better way has been found to do this.

Optimise the alternate case. Fail fast and stop splitting buckets if store_body is no longer being called.

mod_cache: Fix an out of memory condition that occurs when the cache tries to save huge files (greater than RAM). Buckets bigger than a tuneable threshold are split into smaller buckets before being passed to mod_disk_cache, etc. PR 39380

mod_cache: Eliminate a bogus error in the log when a filter returns AP_FILTER_ERROR.

Don't cache requests with a expires date in the past; otherwise mod_cache will always try to cache the URL. This bug might lead to numerous rename() errors on win32 if the URL was previously cached.

* Remove all filters that are before the cache_out filter. This ensures that we kick off the filter stack with our cache_out filter being the first in the chain. This make sense because we want to restore things in the same manner as we saved them. There may be filters before our cache_out filter, because 1. We call ap_set_content_type during cache_select. This causes Content-Type specific filters to be added. 2. We call the insert_filter hook. This causes filters e.g. like the ones set with SetOutputFilter to be added. PR: 40090

update license header text

Update the copyright year in all .c, .h and .xml files

* Add CacheMinExpire directive to set the minimum time in seconds to cache a document in the case that no valid expire time was supplied with the document. Submitted by: Brian Akins <brian.akins turner.com> Reviewed by: Ruediger Pluem

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

* Create new filters CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ which only differ by the type (AP_FTYPE_CONTENT_SET-1) from CACHE_OUT / CACHE_SAVE (AP_FTYPE_CONTENT_SET+1). This ensures that subrequests to non local resources do not get stuck in the middle of the road with the contents only written to the temp file, because CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ are inserted *before* the SUBREQ_CORE filter in the filter chain.

Fixes and cleanups for mod_cache; * Add r->uri to the debug messages in the quick handler; makes debugging easier. * Always reset headers_in for lookup's, some modules make subrequests and then rewrite the url. Having a conditional request at this point is not what they expect (nor reasonable for them to handle). * Don't store a per-request config on lookups; for the same reason. * Return DECLINED when in lookup mode and ap_meets_conditions() indicated we have the content but don't know if it's fresh or not. We have no idea whether the backend will have a 404, a 304 or any other kind of a response - so we have to assume we cannot handle the request. * remove the unused "url" argument from the cache_create_entity() function * Whitespace/comment fixups in mod_cache.h

Enhance CacheEnable/CacheDisable to control caching on a per-protocol, per-host and per-path basis. Makes Cache(En|Dis)able useful for forward proxy servers.

remove some unused variables and re-name cache_select_url() to simply cache_select()

Move the debuging log message about the removal of a url from cache_remove_url_filter to cache_remove_url. Submitted by: Rudiger Plum <ruediger.pluem vodafone.com> Reviewed by: Justin Erenkrantz

Fix incorrectly served 304 responses when expired cache entity is valid, but cache is unwritable and headers cannot be updated. Submitted by: Colm MacCarthaigh <colm stdlib.net> Reviewed by: Justin Erenkrantz

mod_cache: Implement remove URL via a filter. Remove entities from the cache when re-validation receives a 404 or other content-no-longer-present error. Suggested by: Paul Querna, Justin Erenkrantz Submitted by: Rudiger Plum <ruediger.pluem vodafone.com> Reviewed by: Justin Erenkrantz

Opps. Use the correct member of the structure.

Correctly restore the HTTP status from the cache handler. Submitted by: Hansjoerg Pehofer

Now you can run mod_deflate before mod_cache, and cache it.

* cache_save_filter: *) Remove the first set of Validation code. Use the main if structure to check for both 'Vary: *' and 'Cache-Control: no-store'. *) Add logging of failures for a provider's store_body function.

* mod_cache.c: When 'Vary: *' is sent, do not cache, since revalidation is always required. PR: 16125

Another mod_cache fixlet. * modules/cache/mod_cache.c (cache_url_handler): Add more debug output. Restore original request headers when CACHE_SAVE filter isn't added to fix up after the request. * modules/cache/cache_storage.c (cache_select_url): Add more debug output.

Improve caching a bit more... * modules/cache/cache_util.c (ap_cache_check_freshness): On Cache-Control/Pragma no-cache force revalidation by marking the resource as stale. Unless IgnoreCacheControl is set ofcourse. * modules/cache/mod_cache.c (cache_url_handler): Remove Cache-Control/Pragma no-cache check and accompagnying comment. (cache_save_filter): Move FIXME comment to the correct location.

More mod_cache tweakage... * modules/cache/mod_cache.c (cache_save_filter): Instead of unconditionally returning a 304 when the original request was conditional and we issued a cache revalidating request, handle the request as if it came in while our cache was still valid. * modules/cache/cache_storage.c (cache_select_url): Strip off the conditional headers from the original request, prior to adding our own for the purpose of revalidating our cached response.

* modules/cache/mod_cache.c (cache_url_handler): Tweak a few comments. (cache_save_filter): Add a FIXME for a corner case.

Some minimal tweaks to mod_cache. * modules/cache/mod_mem_cache.c (store_headers): Remove unused variable. * modules/cache/mod_cache.c (cache_save_filter): Slightly improve comment.

More work to properly handle revalidated responses correctly. * modules/cache/mod_cache.c: If we add a new Expires value, tell our client; merge in headers properly (or better than before) so that we can update the header fields on a revalidated but with updated header fields. * modules/cache/mod_cache.h, modules/cache/cache_storage.c: Add preserve_orig flag to ap_cache_accept_headers to allow updating of fields. * modules/cache/mod_disk_cache.c: Load status value from disk.

Return the proper status and headers when serving a revalidated response. * modules/cache/mod_cache.c (cache_save_filter): Load in the cached status and headers; send a flush rather than an EOS when the client request is conditional. * modules/cache/mod_cache.h: Export ap_cache_accept_headers. * modules/cache/cache_storage.c: Rename accept_headers to ap_cache_accept_headers.

Cleanup structures in mod_cache and friends to remove unused or unnecessary fields. Also resolves a number of latent bugs due to the wrong fields being accessed.

* modules/cache/mod_cache.c: One more try at proper handling of revalidated responses. ...All together now, we hate uninitialized variables...

Update copyright year to 2005 and standardize on current copyright owner line.

Error out on configurations where the cache provider starts with a '/'. Saves certain people a bit of time figuring out why their caching doesn't work... * modules/cache/mod_cache.c (add_cache_enable): Throw an error when a provider starting with a '/' is encountered. The user probably switched arguments.

Add CacheStorePrivate, CacheStoreNoStore, and clarify CacheIgnoreCacheControl. * docs/manual/mod/mod_cache.xml: Update documentation for CacheIgnoreCacheControl and add documentation for two new directives. * modules/cache/mod_cache.c (cache_url_handler): Honor 'Cache-Control: no-cache' request header. (cache_save_filter): Only honor no-store or private when their respective directives are Off (which is the default). rest of file: add in standard configuration syntax stuff... * modules/cache/mod_cache.h: Minor formatting tweak and add new fields. Suggested by: Pier Fumagalli

mod_cache: Remove unimplemented CacheForceCompletion directive. * modules/cache/mod_cache.h: Remove DEFAULT_CACHE_COMPLETION #define and complete-related vars. * modules/cache/mod_cache.c: Ditto. * modules/cache/mod_disk_cache.c: Clarify error message; remove unused complete var (unrelated to CacheForceCompletion removal). * docs/manual/mod/mod_cache.xml.ja, docs/manual/mod/mod_cache.xml.ko, docs/manual/mod/mod_cache.xml: Remove references to CacheForceCompletion.

At long last, promote mod_cache and friends out of experimental/. Also, take quick pass through docs files to remove experimental label for them. Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz