X-Git-Url: https://juplo.de/gitweb/?p=percentcodec;a=blobdiff_plain;f=cachecontrol%2Fsrc%2Fmain%2Fjava%2Fde%2Fhalbekunst%2Fjuplo%2Fcachecontrol%2FCacheControl.java;h=c7bee9e0a0ce9710c26c73af50809b878218855a;hp=24d27d3c31cdde6bdbc2447837b0dc8f3a42b388;hb=61a5f26b9005470c242ca76d398dd07687074713;hpb=192d7e5f83aed0c651400f393fd000f15f72fc10

diff --git a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
index 24d27d3c..c7bee9e0 100644
--- a/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
+++ b/cachecontrol/src/main/java/de/halbekunst/juplo/cachecontrol/CacheControl.java
@@ -93,18 +93,14 @@ public class CacheControl {
       case HttpServletResponse.SC_NOT_IMPLEMENTED: // 501
       case HttpServletResponse.SC_SERVICE_UNAVAILABLE: // 503
       case HttpServletResponse.SC_HTTP_VERSION_NOT_SUPPORTED: // 505
-        return true;
       default:
         /**
          * Es ist nicht klar, was der Handler noch machen wird/muss:
          * Antwort nicht dekorieren und Kontroller an den Handler übergeben...
          */
-        return false;
+        return true;
     }
 
-    if (handle.isZipped())
-      response.addHeader(Headers.HEADER_CONTENT_ENCODING, "gzip");
-
     Map<String,String> headers = handle.getAdditionalHeaders(request);
     for (String name : headers.keySet())
       response.addHeader(name, headers.get(name));
@@ -134,6 +130,8 @@ public class CacheControl {
       response.addHeader(Headers.HEADER_CACHE_CONTROL, "no-store");
       response.addHeader(Headers.HEADER_CACHE_CONTROL, "max-age=0");
       response.addHeader(Headers.HEADER_CACHE_CONTROL, "s-max-age=0");
+      if (handle.isZipped())
+        response.addHeader(Headers.HEADER_CONTENT_ENCODING, "gzip");
       return true;
     }
 
@@ -224,6 +222,9 @@ public class CacheControl {
 
     log.debug("{}: first up!", url);
 
+    if (handle.isZipped())
+      response.addHeader(Headers.HEADER_CONTENT_ENCODING, "gzip");
+
     /** HTTP/1.1-Caching-Header richtig setzen!! */
     response.setDateHeader(Headers.HEADER_LAST_MODIFIED, lastModified);
 
@@ -327,7 +328,6 @@ public class CacheControl {
 
       cacheSeconds = CacheControl.this.defaultCacheSeconds;
       lastModified = CacheControl.this.defaultLastModified;
-      eTag = "";
 
       /** Class-Level-Annotations auslesen */
       for (Annotation annotation : handler.getClass().getAnnotations()) {