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 2013/05/05 16:34:48 UTC

Re: svn commit: r1479222 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c modules/cache/cache_util.c modules/cache/cache_util.h modules/cache/mod_cache.c


minfrin@apache.org wrote:
> Author: minfrin
> Date: Sun May  5 01:12:48 2013
> New Revision: 1479222
> 
> URL: http://svn.apache.org/r1479222
> Log:
> mod_cache: Honour Cache-Control: no-store in a request.
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/modules/cache/cache_storage.c
>     httpd/httpd/trunk/modules/cache/cache_util.c
>     httpd/httpd/trunk/modules/cache/cache_util.h
>     httpd/httpd/trunk/modules/cache/mod_cache.c
> 

> Modified: httpd/httpd/trunk/modules/cache/cache_util.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=1479222&r1=1479221&r2=1479222&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/cache/cache_util.c (original)
> +++ httpd/httpd/trunk/modules/cache/cache_util.c Sun May  5 01:12:48 2013
> @@ -410,9 +410,9 @@ apr_status_t cache_remove_lock(cache_ser
>      return apr_file_remove(lockname, r->pool);
>  }
>  
> -CACHE_DECLARE(int) ap_cache_check_allowed(cache_request_rec *cache, request_rec *r) {
> -    const char *cc_req;
> -    const char *pragma;
> +int ap_cache_check_no_cache(cache_request_rec *cache, request_rec *r)
> +{
> +

Why no longer CACHE_DECLARE(int)?

Regards

RĂ¼diger


Re: svn commit: r1479222 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c modules/cache/cache_util.c modules/cache/cache_util.h modules/cache/mod_cache.c

Posted by Graham Leggett <mi...@sharp.fm>.
On 05 May 2013, at 4:34 PM, Ruediger Pluem <rp...@apache.org> wrote:

>> Modified: httpd/httpd/trunk/modules/cache/cache_util.c
>> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/cache_util.c?rev=1479222&r1=1479221&r2=1479222&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/cache/cache_util.c (original)
>> +++ httpd/httpd/trunk/modules/cache/cache_util.c Sun May  5 01:12:48 2013
>> @@ -410,9 +410,9 @@ apr_status_t cache_remove_lock(cache_ser
>>     return apr_file_remove(lockname, r->pool);
>> }
>> 
>> -CACHE_DECLARE(int) ap_cache_check_allowed(cache_request_rec *cache, request_rec *r) {
>> -    const char *cc_req;
>> -    const char *pragma;
>> +int ap_cache_check_no_cache(cache_request_rec *cache, request_rec *r)
>> +{
>> +
> 
> Why no longer CACHE_DECLARE(int)?

Because it never appeared in a public header.

Ideally this function should be called cache_check_no_cache(), not ap_cache_check_no_cache().

Regards,
Graham
--