* Style police. No functional changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@649228 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index 2317d97c687c1daa90fce03963b07fd74d4ff617..abff9f5a260c13be9b0140edd663f61fe8efe1c1 100644 (file)
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -577,7 +577,8 @@ CACHE_DECLARE(char *)ap_cache_generate_name(apr_pool_t *p, int dirlevels,
     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 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers(apr_pool_t *pool,
      * (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 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_headers(apr_pool_t *pool,
     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 @@ CACHE_DECLARE(apr_table_t *)ap_cache_cacheable_hdrs_out(apr_pool_t *p,
     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;
 }

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 9806d09db38c34f66e4eb6fb073b7fe6edccb77e..8212d63fdacfcdd9e9842b513d867a7d7a6abce4 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -760,7 +760,7 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
         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,