You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/11/30 22:56:12 UTC
svn commit: r1208822 - in /httpd/httpd/trunk: include/ap_mmn.h
modules/cache/mod_cache.h modules/cache/mod_cache_disk.c
Author: minfrin
Date: Wed Nov 30 21:56:11 2011
New Revision: 1208822
URL: http://svn.apache.org/viewvc?rev=1208822&view=rev
Log:
mod_cache: Apply the API change that allows future mod_cache providers to
invalidate cache entries, which will fix PR15868.
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/cache/mod_cache.h
httpd/httpd/trunk/modules/cache/mod_cache_disk.c
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1208822&r1=1208821&r2=1208822&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Wed Nov 30 21:56:11 2011
@@ -370,12 +370,13 @@
* 20111120.0 (2.5.0-dev) Remove parts of conn_state_t that are private to the MPM
* 20111121.0 (2.5.0-dev) Pass ap_errorlog_info struct to error_log hook,
* add pool to ap_errorlog_info.
+ * 20111201.0 (2.5.0-dev) Add invalidate_entity() to the cache provider.
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 20111121
+#define MODULE_MAGIC_NUMBER_MAJOR 20111201
#endif
#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=1208822&r1=1208821&r2=1208822&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.h Wed Nov 30 21:56:11 2011
@@ -109,6 +109,7 @@ typedef struct {
const char *urlkey);
int (*remove_url) (cache_handle_t *h, request_rec *r);
apr_status_t (*commit_entity)(cache_handle_t *h, request_rec *r);
+ apr_status_t (*invalidate_entity)(cache_handle_t *h, request_rec *r);
} cache_provider;
typedef enum {
Modified: httpd/httpd/trunk/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache_disk.c?rev=1208822&r1=1208821&r2=1208822&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache_disk.c Wed Nov 30 21:56:11 2011
@@ -1325,6 +1325,11 @@ static apr_status_t commit_entity(cache_
return APR_SUCCESS;
}
+static apr_status_t invalidate_entity(cache_handle_t *h, request_rec *r)
+{
+ return APR_ENOTIMPL;
+}
+
static void *create_dir_config(apr_pool_t *p, char *dummy)
{
disk_cache_dir_conf *dconf = apr_pcalloc(p, sizeof(disk_cache_dir_conf));
@@ -1502,7 +1507,8 @@ static const cache_provider cache_disk_p
&create_entity,
&open_entity,
&remove_url,
- &commit_entity
+ &commit_entity,
+ &invalidate_entity
};
static void disk_cache_register_hook(apr_pool_t *p)