You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2008/04/17 20:48:20 UTC
svn commit: r649228 - in /httpd/httpd/trunk/modules/cache: cache_util.c
mod_cache.c
Author: rpluem
Date: Thu Apr 17 11:48:18 2008
New Revision: 649228
URL: http://svn.apache.org/viewvc?rev=649228&view=rev
Log:
* Style police. No functional changes.
Modified:
httpd/httpd/trunk/modules/cache/cache_util.c
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=649228&r1=649227&r2=649228&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_util.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_util.c Thu Apr 17 11:48:18 2008
@@ -577,7 +577,8 @@
return apr_pstrdup(p, hashfile);
}
-/* Create a new table consisting of those elements from an
+/*
+ * Create a new table consisting of those elements from an
* headers table that are allowed to be stored in a cache.
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers(apr_pool_t *pool,
@@ -592,7 +593,7 @@
* (yet) any headers populated.
*/
if (t == NULL) {
- return apr_table_make(pool, 10);
+ return apr_table_make(pool, 10);
};
/* Make a copy of the headers, and remove from
@@ -624,7 +625,8 @@
return headers_out;
}
-/* Legacy call - functionally equivalent to ap_cache_cacheable_headers.
+/*
+ * Legacy call - functionally equivalent to ap_cache_cacheable_headers.
* @deprecated @see ap_cache_cacheable_headers
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_hdrs_out(apr_pool_t *p,
@@ -634,33 +636,35 @@
return ap_cache_cacheable_headers(p,t,s);
}
-/* Create a new table consisting of those elements from an input
+/*
+ * Create a new table consisting of those elements from an input
* headers table that are allowed to be stored in a cache.
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_in(request_rec * r)
{
- return ap_cache_cacheable_headers(r->pool, r->headers_in, r->server);
+ return ap_cache_cacheable_headers(r->pool, r->headers_in, r->server);
}
-/* Create a new table consisting of those elements from an output
+/*
+ * Create a new table consisting of those elements from an output
* headers table that are allowed to be stored in a cache;
* ensure there is a content type and capture any errors.
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers_out(request_rec * r)
{
- apr_table_t *headers_out;
+ apr_table_t *headers_out;
- headers_out = ap_cache_cacheable_headers(r->pool, r->headers_out,
+ headers_out = ap_cache_cacheable_headers(r->pool, r->headers_out,
r->server);
- if (!apr_table_get(headers_out, "Content-Type")
- && r->content_type) {
- apr_table_setn(headers_out, "Content-Type",
- ap_make_content_type(r, r->content_type));
- }
+ if (!apr_table_get(headers_out, "Content-Type")
+ && r->content_type) {
+ apr_table_setn(headers_out, "Content-Type",
+ ap_make_content_type(r, r->content_type));
+ }
- headers_out = apr_table_overlay(r->pool, headers_out,
- r->err_headers_out);
+ headers_out = apr_table_overlay(r->pool, headers_out,
+ r->err_headers_out);
- return headers_out;
+ return headers_out;
}
Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=649228&r1=649227&r2=649228&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Thu Apr 17 11:48:18 2008
@@ -760,7 +760,7 @@
r->headers_out = apr_table_overlay(r->pool, r->headers_out,
r->err_headers_out);
- /* XXX check -- we're not patching up content-type - i.e. this
+ /* XXX check -- we're not patching up content-type - i.e. this
* propably should be ap_cache_cacheable_headers_out().
*/
r->headers_out = ap_cache_cacheable_headers(r->pool, r->headers_out,
Re: svn commit: r649228 - in /httpd/httpd/trunk/modules/cache: cache_util.c
mod_cache.c
Posted by Ruediger Pluem <rp...@apache.org>.
On 04/17/2008 09:39 PM, Dirk-Willem van Gulik wrote:
>
> On Thu, 17 Apr 2008 rpluem@apache.org wrote:
>
>> * Style police. No functional changes.
>
> Are you using .indent.pro ? If so - which one ?
No, I am using the following .vimrc settings which
I took over from Justin:
syntax enable
" Added entries from Justins vimrc file
" Makefiles ALWAYS must have real TABS
autocmd FileType make set noet
let c_syntax_for_h=1
autocmd FileType c set ts=4 sw=4 et cindent cino=:0(0 fo+=ro
" Denote tabs with a double chevron and trailing spaces with a funny char
set list listchars=tab:»·,trail:·
set showmatch
Regards
Rüdiger
Re: svn commit: r649228 - in /httpd/httpd/trunk/modules/cache:
cache_util.c mod_cache.c
Posted by Dirk-Willem van Gulik <di...@webweaving.org>.
On Thu, 17 Apr 2008 rpluem@apache.org wrote:
> * Style police. No functional changes.
Are you using .indent.pro ? If so - which one ?
Thanks,
Dw