use actual error code in AH00779

SECURITY (CVE-2014-3581): Fix a mod_cache NULL pointer deference in Content-Type handling. mod_cache: Avoid a crash when Content-Type has an empty value. PR56924. Submitted By: Mark Montague <mark catseye.org> Reviewed By: Jan Kaluza

Add missing APLOGNO. Refactor to keep APLOGNO on the same line as ap_log_error, when applicable.

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

mod_cache: follow up to r1594643. Avoid table lookup if not necessary (fast path first).

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.

Fix errors with CacheLock on Windows: cache_util.c(757): (OS 80)The file exists. : [client 127.0.0.1:63889] AH00784: Attempt to obtain a cache lock for stale cached URL failed, revalidating entry anyway:

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

mod_cache: Make sure Vary processing handles multivalued Vary headers and multivalued headers referred to via Vary.

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

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

* modules/cache/cache_util.c (write_write_order): Remove redundant double assignment, caught by Coverity. No functional change.

Avoid segfault if url->hostname is NULL and filter->hostname is "*" or ".". Found by clang.

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

Add lots of unique tags to error log messages

Avoid some memory allocations by using apr_table_setn where the string arguments are const. Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr> PR: 51357

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

Don't skip the first character, as it may be a quote, which is handled by the walk below.

fix theoretical const issue in call to strchr()

mod_cache: We must ignore quoted-string values that appear in a Cache-Control header. PR 50199.

mod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must take precedence if present. PR 35247.

mod_cache: correctly parse quoted strings in cache headers. PR 50199

Be more efficient when handling the Expires header.

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

Support Cache-Control: no-cache with a header name, and private with a header name, which causes a cached entry to require revalidation (ie is always not-fresh), as per RFC2616 14.9.1.

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

Begin the process of optimising the parsing of Cache-Control headers. Parse the incoming Cache-Control and Pragma headers once, instead of on each test.

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.

Make cache_provider_list and cache_request_rec private by moving them out of mod_cache.h.

Make cache_server_conf, cache_enable and cache_disable private. Remove public prefixes from ap_cache_accept_headers, ap_cache_try_lock and ap_cache_get_providers.

Remove deprecated ap_cache_cacheable_hdrs_out.

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

remove unused variables

mod_cache: Check the request to determine whether we are allowed to return cached content at all, and respect a "Cache-Control: no-cache" header from a client. Previously, "no-cache" would behave like "max-age=0".

Pass the huge apr_uri_t structs by reference instead of by value

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

* According to RFC2616 13.2.3 1. negative results of age calculations should be replaced by zero. Reported by: Ryujiro Shibuya <rshibuya gmail.com>

Style fixes.

Remove the server_rec wired into uri_meets_conditions, the debugging statements that required it were removed in the past, so wiring through server_rec is no longer necessary.

mod_cache: Fix uri_meets_conditions() so that CacheEnable will match by scheme, or by a wildcarded hostname. PR: 40169 Submitted by: Peter Grandi <pg_asf asf.for.sabi.co.uk> Reviewed by: Graham Leggett

Add suggested parentheses around APR_STATUS_IS_ENOENT.

moved "finfo.mtime = 0;" after var declaration; removed tab.

Add parenthesis for legibility and correcting association, and axe an unused variable

Make sure when adding a warning, that we don't duplicate an existing warning.

When attempting to set the stale lock, we will pass try_lock twice. If we already have the lock the first time, we must also have the lock the second time.

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.

* Correctly save Content-Encoding of cachable entity. PR: 46401 Submitted by: Dan Poirier <poirier pobox.com> Reviewed by: rpluem

* We need to use the headers_out table we merged above, not the original one.

* Style fixes. No functional changes.

* Use the correct headers_out table for overlaying.

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.

Make it compile on pre-C99 compilers

* Style police. No functional changes.

Currently each of the caching module includes logic to implement the hop-by-hop rules of rfc 2616 along with the entity response rules. To make sure that they stay in sync; and to make it easier to add (http) caching modules - this change moves them all into one place (cache_util) and exposes a in-bound and out-bound version to operate on the headers. In short: we retire ap_cache_cacheable_hdrs_out() which was used for both in- and out-put headers; and replace it by a single ap_cache_cacheable_headers() which understands the hop-by-hop rules. And then wrap this into an in- and out-put specific ap_cache_cacheable_headers_in()/out() which we can teach things about entity responses and so on.. The latter which will also merge error and ensure content-type. This API change bumps up the minor MM by one.

Remove all references to CORE_PRIVATE.

* If the cached entity contained Cache-Control: no-cache, treat it as stale causing revalidation. PR: 44511

* Prevent a segmentation fault if one of the Cache-Control headers s-maxage, max-age, min-fresh, max-stale has no value assigned. In this case ignore s-maxage, max-age, min-fresh. For max-stale it is valid to set no value. In this case set max-stale to 1 year to signal that the client is accepting a stale response of any age. Submitted by: Niklas Edmundsson <nikke acc.umu.se> Reviewed by: rpluem

mod_cache: From RFC3986 (section 6.2.3.) if a URI contains an authority component and an empty path, the empty path is to be equivalent to "/". It explicitly cites the following four URIs as equivalents: http://example.com http://example.com/ http://example.com:/ http://example.com:80/

update license header text

* info->expire and info->date are in microseconds. So convert the difference to seconds before comparing it to age which is in seconds. PR: 39713 Submitted by: Owen Taylor <otaylor redhat.com> Reviewed by: rpluem

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

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

No functional change: simple detabbing of indented code.

Two minor whitespace cleanups. Syncs with the 2.2.x branch.

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.

'generate_name' is too generic to be in the public symbols. Rename it to ap_cache_generate_name. No functional changes.

Make IgnoreCacheControl do what it implies when it comes to requests and freshness checks. * modules/cache/cache_util.c (ap_cache_check_freshness): Ignore CacheControl: max-age and min-fresh if IgnoreCacheControl is set.

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.

Remove an unused function. * cache_util.c * mod_cache.imp * mod_cache.h (ap_cache_request_is_conditional): Removed.

* modules/cache/cache_util.c (ap_cache_check_freshness): Use r->headers_in not the stored headers for the Cache-Control check. Pointed out by: Sander Striker

* modules/cache/mod_disk_cache.c (store_body): Fix format string warnings; print integers using _FMT strings. * modules/cache/cache_util.c (ap_cache_check_freshness): Remove unused variable. * modules/cache/cache_storage.c (cache_select_url): Remove unused variable.

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.

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

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