477737 Improve handling of etags with dynamic and static gzip

1 files changed, 11 insertions, 0 deletions

diff --git a/jetty-http/src/main/java/org/eclipse/jetty/http/GzipHttpContent.java b/jetty-http/src/main/java/org/eclipse/jetty/http/GzipHttpContent.java
index ff70f3777f..1354358def 100644
--- a/jetty-http/src/main/java/org/eclipse/jetty/http/GzipHttpContent.java
+++ b/jetty-http/src/main/java/org/eclipse/jetty/http/GzipHttpContent.java
@@ -32,8 +32,19 @@ public class GzipHttpContent implements HttpContent
     private final HttpContent _content; 
     private final HttpContent _contentGz;
     public final static String ETAG_GZIP="--gzip";
+    public final static String ETAG_GZIP_QUOTE="--gzip\"";
     public final static PreEncodedHttpField CONTENT_ENCODING_GZIP=new PreEncodedHttpField(HttpHeader.CONTENT_ENCODING,"gzip");
     
+    public static String removeGzipFromETag(String etag)
+    {
+        if (etag==null)
+            return null;
+        int i = etag.indexOf(ETAG_GZIP_QUOTE);
+        if (i<0)
+            return etag;
+        return etag.substring(0,i)+'"';
+    }
+    
     public GzipHttpContent(HttpContent content, HttpContent contentGz)
     {  
         _content=content;