You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ruediger Pluem <rp...@apache.org> on 2006/01/17 16:20:03 UTC
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
On 01/17/2006 04:12 PM, rpluem@apache.org wrote:
[..cut..]
>
> ==============================================================================
> --- httpd/httpd/trunk/modules/cache/mod_cache.h (original)
> +++ httpd/httpd/trunk/modules/cache/mod_cache.h Tue Jan 17 07:12:23 2006
> @@ -84,6 +84,7 @@
> #define MSEC_ONE_MIN ((apr_time_t)(60*APR_USEC_PER_SEC)) /* one minute, in microseconds */
> #define MSEC_ONE_SEC ((apr_time_t)(APR_USEC_PER_SEC)) /* one second, in microseconds */
> #define DEFAULT_CACHE_MAXEXPIRE MSEC_ONE_DAY
> +#define DEFAULT_CACHE_MINEXPIRE 0
> #define DEFAULT_CACHE_EXPIRE MSEC_ONE_HR
> #define DEFAULT_CACHE_LMFACTOR (0.1)
>
> @@ -150,6 +151,9 @@
> #define CACHE_IGNORE_HEADERS_SET 1
> #define CACHE_IGNORE_HEADERS_UNSET 0
> int ignore_headers_set;
> + /* Minimum time to keep cached files in msecs */
> + apr_time_t minex;
> + int minex_set;
> } cache_server_conf;
Does this change require some sort of bump? And if yes what kind of?
Regards
Rüdiger
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
Posted by Ruediger Pluem <rp...@apache.org>.
On 01/17/2006 05:19 PM, Bill Stoddard wrote:
> Ruediger Pluem wrote:
[..cut..]
>>
>> Does this change require some sort of bump? And if yes what kind of?
>>
[..cut..]
>
>
> I was about to reply 'I don't think so' under the argument that
> cache_server_conf is not part of the Apache module API, it should only
> be referenced by the cache modules. However, I don't recall if the core
Makes sense, but what about 3rd party storage modules / providers for mod_cache?
Wouldn't they be affected by this?
Regards
Rüdiger
[..cut..]
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
Posted by Ruediger Pluem <rp...@apache.org>.
On 01/17/2006 09:55 PM, William A. Rowe, Jr. wrote:
[..cut..]
> Yet third party modules may be using this. Since you wisely;
>
> @@ -150,6 +151,9 @@
> #define CACHE_IGNORE_HEADERS_SET 1
> #define CACHE_IGNORE_HEADERS_UNSET 0
> int ignore_headers_set;
> + /* Minimum time to keep cached files in msecs */
> + apr_time_t minex;
> + int minex_set;
> } cache_server_conf;
>
> dropped these at the end of the cache_server_conf, the bump is minor (the
Thanks for clarification. So this is what needs to be done, right (Just
asking because it is my first bump :-))?
Index: include/ap_mmn.h
===================================================================
--- include/ap_mmn.h (Revision 369902)
+++ include/ap_mmn.h (Arbeitskopie)
@@ -112,8 +112,10 @@
* 20051231.0 (2.3.0-dev) Added num_blank_lines, pending_header_line, and
* pending_header_size to request_rec
* 20060110.0 (2.3.0-dev) Conversion of Authz to be provider based
- addition of <SatisfyAll><SatisfyOne>
- removal of Satisfy, Allow, Deny, Order
+ * addition of <SatisfyAll><SatisfyOne>
+ * removal of Satisfy, Allow, Deny, Order
+ * 20060110.1 (2.3.0-dev) minex and minex_set members added to
+ * cache_server_conf (minor)
*/
#define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -121,7 +123,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20060110
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
Regards
Rüdiger
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Brian Akins wrote:
> Bill Stoddard wrote:
>
>> However, I don't recall if the core server is dependent on knowing the
>> size of module conf structures (during merge operations for instance).
>
> I'm pretty sure not. the conf structures are just void *'s that are
> passed around. I change crap all the time in my dev environment and
> have never hit a snag.
Yet third party modules may be using this. Since you wisely;
@@ -150,6 +151,9 @@
#define CACHE_IGNORE_HEADERS_SET 1
#define CACHE_IGNORE_HEADERS_UNSET 0
int ignore_headers_set;
+ /* Minimum time to keep cached files in msecs */
+ apr_time_t minex;
+ int minex_set;
} cache_server_conf;
dropped these at the end of the cache_server_conf, the bump is minor (the
mod_cache compiled module allocates its structure itself, which is why the
owner module does the merges for its _conf structure.)
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
Posted by Brian Akins <br...@turner.com>.
Bill Stoddard wrote:
>However, I don't recall if the core
> server is dependent on knowing the size of module conf structures
> (during merge operations for instance).
I'm pretty sure not. the conf structures are just void *'s that are
passed around. I change crap all the time in my dev environment and
have never hit a snag.
--
Brian Akins
Lead Systems Engineer
CNN Internet Technologies
Re: svn commit: r369811 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_cache.xml
modules/cache/mod_cache.c modules/cache/mod_cache.h
Posted by Bill Stoddard <bi...@wstoddard.com>.
Ruediger Pluem wrote:
>>
>>@@ -150,6 +151,9 @@
>> #define CACHE_IGNORE_HEADERS_SET 1
>> #define CACHE_IGNORE_HEADERS_UNSET 0
>> int ignore_headers_set;
>>+ /* Minimum time to keep cached files in msecs */
>>+ apr_time_t minex;
>>+ int minex_set;
>> } cache_server_conf;
>
>
> Does this change require some sort of bump? And if yes what kind of?
>
> Regards
>
> Rüdiger
I was about to reply 'I don't think so' under the argument that cache_server_conf is not part of the Apache
module API, it should only be referenced by the cache modules. However, I don't recall if the core server is
dependent on knowing the size of module conf structures (during merge operations for instance). I think not,
but I could be mistaken.
Bill