httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1000211 - in /httpd/httpd/trunk/modules/cache: cache_storage.c cache_storage.h cache_util.c cache_util.h mod_cache.h
Date Wed, 22 Sep 2010 20:44:50 GMT
Author: minfrin
Date: Wed Sep 22 20:44:50 2010
New Revision: 1000211

URL: http://svn.apache.org/viewvc?rev=1000211&view=rev
Log:
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.

Modified:
    httpd/httpd/trunk/modules/cache/cache_storage.c
    httpd/httpd/trunk/modules/cache/cache_storage.h
    httpd/httpd/trunk/modules/cache/cache_util.c
    httpd/httpd/trunk/modules/cache/cache_util.h
    httpd/httpd/trunk/modules/cache/mod_cache.h

Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=1000211&r1=1000210&r2=1000211&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Wed Sep 22 20:44:50 2010
@@ -114,8 +114,8 @@ static int set_cookie_doo_doo(void *v, c
  * Take headers from the cache, and overlap them over the existing response
  * headers.
  */
-CACHE_DECLARE(void) ap_cache_accept_headers(cache_handle_t *h, request_rec *r,
-                                            int preserve_orig)
+void cache_accept_headers(cache_handle_t *h, request_rec *r,
+        int preserve_orig)
 {
     apr_table_t *cookie_table, *hdr_copy;
     const char *v;
@@ -339,7 +339,7 @@ int cache_select(cache_request_rec *cach
             }
 
             /* Okay, this response looks okay.  Merge in our stuff and go. */
-            ap_cache_accept_headers(h, r, 0);
+            cache_accept_headers(h, r, 0);
 
             cache->handle = h;
             return OK;

Modified: httpd/httpd/trunk/modules/cache/cache_storage.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_storage.h?rev=1000211&r1=1000210&r2=1000211&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.h Wed Sep 22 20:44:50 2010
@@ -42,6 +42,16 @@ int cache_select(cache_request_rec *cach
 apr_status_t cache_generate_key_default(cache_request_rec *cache, request_rec *r,
                                         apr_pool_t* p, char **key);
 
+/**
+ * Merge in cached headers into the response
+ * @param h cache_handle_t
+ * @param r request_rec
+ * @param preserve_orig If 1, the values in r->headers_out are preserved.
+ *        Otherwise, they are overwritten by the cached value.
+ */
+void cache_accept_headers(cache_handle_t *h, request_rec *r,
+        int preserve_orig);
+
 #ifdef __cplusplus
 }
 #endif

Modified: httpd/httpd/trunk/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=1000211&r1=1000210&r2=1000211&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Wed Sep 22 20:44:50 2010
@@ -16,6 +16,7 @@
 
 #include "mod_cache.h"
 
+#include "cache_util.h"
 #include <ap_provider.h>
 
 APLOG_USE_MODULE(cache);
@@ -123,9 +124,9 @@ static int uri_meets_conditions(const ap
     return !strncmp(filter->path, url->path, pathlen);
 }
 
-CACHE_DECLARE(cache_provider_list *)ap_cache_get_providers(request_rec *r,
-                                                  cache_server_conf *conf,
-                                                  apr_uri_t uri)
+cache_provider_list *cache_get_providers(request_rec *r,
+        cache_server_conf *conf,
+        apr_uri_t uri)
 {
     cache_provider_list *providers = NULL;
     int i;
@@ -229,7 +230,7 @@ CACHE_DECLARE(apr_int64_t) ap_cache_curr
  * no point is it possible for this lock to permanently deny access to
  * the backend.
  */
-CACHE_DECLARE(apr_status_t) ap_cache_try_lock(cache_server_conf *conf,
+apr_status_t cache_try_lock(cache_server_conf *conf,
         cache_request_rec *cache, request_rec *r, char *key)
 {
     apr_status_t status;
@@ -322,7 +323,7 @@ CACHE_DECLARE(apr_status_t) ap_cache_try
  * If an optional bucket brigade is passed, the lock will only be
  * removed if the bucket brigade contains an EOS bucket.
  */
-CACHE_DECLARE(apr_status_t) ap_cache_remove_lock(cache_server_conf *conf,
+apr_status_t cache_remove_lock(cache_server_conf *conf,
         cache_request_rec *cache, request_rec *r, char *key,
         apr_bucket_brigade *bb)
 {
@@ -441,9 +442,9 @@ CACHE_DECLARE(int) ap_cache_check_allowe
 }
 
 
-CACHE_DECLARE(int) ap_cache_check_freshness(cache_handle_t *h,
-                                            cache_request_rec *cache,
-                                            request_rec *r)
+int cache_check_freshness(cache_handle_t *h,
+        cache_request_rec *cache,
+        request_rec *r)
 {
     apr_status_t status;
     apr_int64_t age, maxage_req, maxage_cresp, maxage, smaxage, maxstale;
@@ -691,7 +692,7 @@ CACHE_DECLARE(int) ap_cache_check_freshn
      * A lock that exceeds a maximum age will be deleted, and another
      * request gets to make a new lock and try again.
      */
-    status = ap_cache_try_lock(conf, cache, r, (char *)h->cache_obj->key);
+    status = cache_try_lock(conf, cache, r, (char *)h->cache_obj->key);
     if (APR_SUCCESS == status) {
         /* we obtained a lock, follow the stale path */
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

Modified: httpd/httpd/trunk/modules/cache/cache_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.h?rev=1000211&r1=1000210&r2=1000211&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.h (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.h Wed Sep 22 20:44:50 2010
@@ -36,6 +36,75 @@ extern "C" {
  * cache_util.c
  */
 
+struct cache_enable {
+    apr_uri_t url;
+    const char *type;
+    apr_size_t pathlen;
+};
+
+struct cache_disable {
+    apr_uri_t url;
+    apr_size_t pathlen;
+};
+
+/* static information about the local cache */
+typedef struct {
+    apr_array_header_t *cacheenable;    /* URLs to cache */
+    apr_array_header_t *cachedisable;   /* URLs not to cache */
+    /* Maximum time to keep cached files in msecs */
+    apr_time_t maxex;
+    int maxex_set;
+    /* default time to keep cached file in msecs */
+    int defex_set;
+    apr_time_t defex;
+    /* factor for estimating expires date */
+    double factor;
+    int factor_set;
+    /** ignore the last-modified header when deciding to cache this request */
+    int no_last_mod_ignore_set;
+    int no_last_mod_ignore;
+    /** ignore client's requests for uncached responses */
+    int ignorecachecontrol;
+    int ignorecachecontrol_set;
+    /** ignore expiration date from server */
+    int store_expired;
+    int store_expired_set;
+    /** ignore Cache-Control: private header from server */
+    int store_private;
+    int store_private_set;
+    /** ignore Cache-Control: no-store header from client or server */
+    int store_nostore;
+    int store_nostore_set;
+    /* flag if CacheIgnoreHeader has been set */
+    #define CACHE_IGNORE_HEADERS_SET   1
+    #define CACHE_IGNORE_HEADERS_UNSET 0
+    int ignore_headers_set;
+    /** store the headers that should not be stored in the cache */
+    apr_array_header_t *ignore_headers;
+    /* Minimum time to keep cached files in msecs */
+    apr_time_t minex;
+    int minex_set;
+    /** ignore query-string when caching */
+    int ignorequerystring;
+    int ignorequerystring_set;
+    /* flag if CacheIgnoreURLSessionIdentifiers has been set */
+    #define CACHE_IGNORE_SESSION_ID_SET   1
+    #define CACHE_IGNORE_SESSION_ID_UNSET 0
+    int ignore_session_id_set;
+    /** store the identifiers that should not be used for key calculation */
+    apr_array_header_t *ignore_session_id;
+    /* thundering herd lock */
+    int lock;
+    int lock_set;
+    const char *lockpath;
+    int lockpath_set;
+    int lockmaxage_set;
+    apr_time_t lockmaxage;
+    /** run within the quick handler */
+    int quick;
+    int quick_set;
+} cache_server_conf;
+
 /**
  * Check the freshness of the cache object per RFC2616 section 13.2 (Expiration Model)
  * @param h cache_handle_t
@@ -85,16 +154,6 @@ apr_status_t cache_remove_lock(cache_ser
         cache_request_rec *cache, request_rec *r, char *key,
         apr_bucket_brigade *bb);
 
-/**
- * Merge in cached headers into the response
- * @param h cache_handle_t
- * @param r request_rec
- * @param preserve_orig If 1, the values in r->headers_out are preserved.
- *        Otherwise, they are overwritten by the cached value.
- */
-void cache_accept_headers(cache_handle_t *h, request_rec *r,
-        int preserve_orig);
-
 cache_provider_list *cache_get_providers(request_rec *r,
         cache_server_conf *conf, apr_uri_t uri);
 

Modified: httpd/httpd/trunk/modules/cache/mod_cache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.h?rev=1000211&r1=1000210&r2=1000211&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.h Wed Sep 22 20:44:50 2010
@@ -111,75 +111,6 @@
 #define CACHE_DECLARE_DATA             __declspec(dllimport)
 #endif
 
-struct cache_enable {
-    apr_uri_t url;
-    const char *type;
-    apr_size_t pathlen;
-};
-
-struct cache_disable {
-    apr_uri_t url;
-    apr_size_t pathlen;
-};
-
-/* static information about the local cache */
-typedef struct {
-    apr_array_header_t *cacheenable;    /* URLs to cache */
-    apr_array_header_t *cachedisable;   /* URLs not to cache */
-    /* Maximum time to keep cached files in msecs */
-    apr_time_t maxex;
-    int maxex_set;
-    /* default time to keep cached file in msecs */
-    int defex_set;
-    apr_time_t defex;
-    /* factor for estimating expires date */
-    double factor;
-    int factor_set;
-    /** ignore the last-modified header when deciding to cache this request */
-    int no_last_mod_ignore_set;
-    int no_last_mod_ignore;
-    /** ignore client's requests for uncached responses */
-    int ignorecachecontrol;
-    int ignorecachecontrol_set;
-    /** ignore expiration date from server */
-    int store_expired;
-    int store_expired_set;
-    /** ignore Cache-Control: private header from server */
-    int store_private;
-    int store_private_set;
-    /** ignore Cache-Control: no-store header from client or server */
-    int store_nostore;
-    int store_nostore_set;
-    /* flag if CacheIgnoreHeader has been set */
-    #define CACHE_IGNORE_HEADERS_SET   1
-    #define CACHE_IGNORE_HEADERS_UNSET 0
-    int ignore_headers_set;
-    /** store the headers that should not be stored in the cache */
-    apr_array_header_t *ignore_headers;
-    /* Minimum time to keep cached files in msecs */
-    apr_time_t minex;
-    int minex_set;
-    /** ignore query-string when caching */
-    int ignorequerystring;
-    int ignorequerystring_set;
-    /* flag if CacheIgnoreURLSessionIdentifiers has been set */
-    #define CACHE_IGNORE_SESSION_ID_SET   1
-    #define CACHE_IGNORE_SESSION_ID_UNSET 0
-    int ignore_session_id_set;
-    /** store the identifiers that should not be used for key calculation */
-    apr_array_header_t *ignore_session_id;
-    /* thundering herd lock */
-    int lock;
-    int lock_set;
-    const char *lockpath;
-    int lockpath_set;
-    int lockmaxage_set;
-    apr_time_t lockmaxage;
-    /** run within the quick handler */
-    int quick;
-    int quick_set;
-} cache_server_conf;
-
 /* cache info information */
 typedef struct cache_info cache_info;
 struct cache_info {



Mime
View raw message