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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023397 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 5f433c3e3c524ecafda814c7e8b04a87debc10bc..3aec253a500c2ace3db0582de7b63b23ea3f53f3 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -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" */

diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h
index a6827a3def0b7f900997bd0b2324d49b2c106ad9..68d7d66823e279c7db2820176b83526c8d13e2af 100644 (file)
--- a/modules/cache/cache_util.h
+++ b/modules/cache/cache_util.h
@@ -225,14 +225,6 @@ typedef struct {
     cache_control_t control_in;         /* cache control incoming */
 } 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)

diff --git a/modules/cache/mod_cache.h b/modules/cache/mod_cache.h
index 0e454f2b174eef58f23799eebcc9785aabe5edd6..dc23cd8651326efa339bae5d63098cfde945e2bd 100644 (file)
--- a/modules/cache/mod_cache.h
+++ b/modules/cache/mod_cache.h
@@ -179,6 +179,14 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_in(request_rec *r);
  */
 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 */