git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649228
13f79535-47bb-0310-9956-
ffa450edef68
return apr_pstrdup(p, hashfile);
}
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,
* headers table that are allowed to be stored in a cache.
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers(apr_pool_t *pool,
* (yet) any headers populated.
*/
if (t == NULL) {
* (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
};
/* Make a copy of the headers, and remove from
-/* 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,
* @deprecated @see ap_cache_cacheable_headers
*/
CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_hdrs_out(apr_pool_t *p,
return ap_cache_cacheable_headers(p,t,s);
}
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)
{
* 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)
{
* 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,
- 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);
r->headers_out = apr_table_overlay(r->pool, r->headers_out,
r->err_headers_out);
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,
* propably should be ap_cache_cacheable_headers_out().
*/
r->headers_out = ap_cache_cacheable_headers(r->pool, r->headers_out,