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 2010/10/17 02:59:45 UTC
svn commit: r1023397 - in /httpd/httpd/trunk: include/ap_mmn.h
modules/cache/cache_util.h modules/cache/mod_cache.h
Author: minfrin
Date: Sun Oct 17 00:59:44 2010
New Revision: 1023397
URL: http://svn.apache.org/viewvc?rev=1023397&view=rev
Log:
As cache_control_t is public, make ap_cache_control() public with it. Bump
the MMN for addition of ap_cache_control(), and the addition of cache_control_t
to the disk format.
Modified:
httpd/httpd/trunk/include/ap_mmn.h
httpd/httpd/trunk/modules/cache/cache_util.h
httpd/httpd/trunk/modules/cache/mod_cache.h
Modified: httpd/httpd/trunk/include/ap_mmn.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_mmn.h?rev=1023397&r1=1023396&r2=1023397&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_mmn.h (original)
+++ httpd/httpd/trunk/include/ap_mmn.h Sun Oct 17 00:59:44 2010
@@ -275,6 +275,8 @@
* 20100923.3 (2.3.9-dev) Add "last" member to ap_directive_t
* 20101012.0 (2.3.9-dev) Add header to cache_status hook.
* 20101016.0 (2.3.9-dev) Remove ap_cache_check_allowed().
+ * 20101017.0 (2.3.9-dev) Make ap_cache_control() public, add cache_control_t
+ * to mod_disk_cache format.
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
Modified: httpd/httpd/trunk/modules/cache/cache_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.h?rev=1023397&r1=1023396&r2=1023397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.h Sun Oct 17 00:59:44 2010
@@ -226,14 +226,6 @@ typedef struct {
} cache_request_rec;
/**
- * Parse the Cache-Control and Pragma headers in one go, marking
- * which tokens appear within the header. Populate the structure
- * passed in.
- */
-int ap_cache_control(request_rec *r, cache_control_t *cc, const char *cc_header,
- const char *pragma_header, apr_table_t *headers);
-
-/**
* Check the whether the request allows a cached object to be served as per RFC2616
* section 14.9.4 (Cache Revalidation and Reload Controls)
* @param h cache_handle_t
Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=1023397&r1=1023396&r2=1023397&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.h Sun Oct 17 00:59:44 2010
@@ -179,6 +179,14 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cac
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_out(request_rec *r);
+/**
+ * Parse the Cache-Control and Pragma headers in one go, marking
+ * which tokens appear within the header. Populate the structure
+ * passed in.
+ */
+int ap_cache_control(request_rec *r, cache_control_t *cc, const char *cc_header,
+ const char *pragma_header, apr_table_t *headers);
+
/* hooks */