Updated Branches:
  refs/heads/master c45d2bc0f -> 7ea31ba59

WICKET-5392 Responses for package resources cannot be compressed

Do not flush the response after writing the headers for a resource.
This was needed as a workaround for some old version of Firefox.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7ea31ba5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7ea31ba5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7ea31ba5

Branch: refs/heads/master
Commit: 7ea31ba59b6f027000a2bcd4b6e31eb5eaf35d21
Parents: c45d2bc
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Mon Oct 28 11:18:23 2013 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Mon Oct 28 11:18:23 2013 +0200

----------------------------------------------------------------------
 .../request/resource/AbstractResource.java       | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7ea31ba5/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
 
b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
index 800886f..56aa348 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/request/resource/AbstractResource.java
@@ -53,7 +53,7 @@ public abstract class AbstractResource implements IResource
 
        static
        {
-               INTERNAL_HEADERS = new HashSet<String>();
+               INTERNAL_HEADERS = new HashSet<>();
                INTERNAL_HEADERS.add("server");
                INTERNAL_HEADERS.add("date");
                INTERNAL_HEADERS.add("expires");
@@ -698,25 +698,8 @@ public abstract class AbstractResource implements IResource
                                        webResponse.addHeader(name, value);
                                }
                        }
-
-                       // 6. Flush the response
-                       flushResponseAfterHeaders(webResponse);
                }
        }
-
-       /**
-        * Flushes the response after setting the headers.
-        * This is necessary for Firefox if this resource is an image,
-        * otherwise it messes up other images on page.
-        *
-        * @param response
-        *      the current web response
-        */
-       protected void flushResponseAfterHeaders(final WebResponse response)
-       {
-               response.flush();
-       }
-
        /**
         * Callback invoked when resource data needs to be written to response. 
Subclass needs to
         * implement the {@link 
#writeData(org.apache.wicket.request.resource.IResource.Attributes)}

Reply via email to