From 6ee4f85cd4a5c5c7157ab4a9af51e52ef2bc2200 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Wed, 1 Jun 2022 17:05:58 -0300 Subject: [PATCH 1/5] Remove Content Encoding --- .gitignore | 2 ++ .../com/genexus/webpanels/HttpContextWeb.java | 34 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5d70c1073..ebe4db79e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,8 @@ target/ *.xlsx +*.db + PublicTempStorage/ PrivateTempStorage/ gxexternalproviders/resources/ diff --git a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java index 1b40e07d4..4a419f29d 100644 --- a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java +++ b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java @@ -439,6 +439,10 @@ public byte setHeader(String header, String value) { return 0; } + public void removeHeader(String headerName){ + response.setHeader(headerName, null); + } + public void setDateHeader(String header, int value) { response.setDateHeader(header, value); } @@ -1018,13 +1022,18 @@ public String getHeader(String header) { public void sendError(int error) { try { - setHeader("Content-Encoding", "text/html"); + disableResponseEncoding(); response.sendError(error); } catch (Exception e) { log.error("Error " + error, e); } } + private void disableResponseEncoding() { + if (compressed) { + removeHeader("Content-Encoding"); + } + } public void setQueryString(String qs) { loadParameters(qs); } @@ -1461,19 +1470,30 @@ public void setStream() { setOutputStream(getResponse().getOutputStream().getOutputStream()); } - if (compressed) { - String accepts = getHeader("Accept-Encoding"); - if (accepts != null && accepts.indexOf("gzip") >= 0) { - setHeader("Content-Encoding", "gzip"); - setOutputStream(new GZIPOutputStream(getOutputStream())); - } + boolean isGzipped = setGzippedHttpResponse(); + if (isGzipped) { + setOutputStream(new GZIPOutputStream(getOutputStream())); } + } } catch (IOException e) { throw new RuntimeException(e.getMessage()); } } + private boolean setGzippedHttpResponse() { + return false; + /*if (compressed) { + String accepts = getHeader("Accept-Encoding"); + if (accepts != null && accepts.indexOf("gzip") >= 0) { + setHeader("Content-Encoding", "gzip"); + return true; + } + } + return false; + */ + } + public void flushStream() { proxyCookieValues(); try { From 4e811fc6ceb4729eb07f858a6dba1320d2277ed5 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Wed, 1 Jun 2022 17:08:48 -0300 Subject: [PATCH 2/5] Restore accidental commit --- .../com/genexus/webpanels/HttpContextWeb.java | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java index 4a419f29d..c41fd54fa 100644 --- a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java +++ b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java @@ -1470,30 +1470,19 @@ public void setStream() { setOutputStream(getResponse().getOutputStream().getOutputStream()); } - boolean isGzipped = setGzippedHttpResponse(); - if (isGzipped) { - setOutputStream(new GZIPOutputStream(getOutputStream())); + if (compressed) { + String accepts = getHeader("Accept-Encoding"); + if (accepts != null && accepts.indexOf("gzip") >= 0) { + setHeader("Content-Encoding", "gzip"); + setOutputStream(new GZIPOutputStream(getOutputStream())); + } } - } } catch (IOException e) { throw new RuntimeException(e.getMessage()); } } - private boolean setGzippedHttpResponse() { - return false; - /*if (compressed) { - String accepts = getHeader("Accept-Encoding"); - if (accepts != null && accepts.indexOf("gzip") >= 0) { - setHeader("Content-Encoding", "gzip"); - return true; - } - } - return false; - */ - } - public void flushStream() { proxyCookieValues(); try { From 419d53d976d5589d6c090599c938fd6f750fea30 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 2 Jun 2022 11:53:05 -0300 Subject: [PATCH 3/5] Set Header To Identity --- .../src/main/java/com/genexus/webpanels/HttpContextWeb.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java index c41fd54fa..517f5caf0 100644 --- a/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java +++ b/java/src/main/java/com/genexus/webpanels/HttpContextWeb.java @@ -439,10 +439,6 @@ public byte setHeader(String header, String value) { return 0; } - public void removeHeader(String headerName){ - response.setHeader(headerName, null); - } - public void setDateHeader(String header, int value) { response.setDateHeader(header, value); } @@ -1031,7 +1027,7 @@ public void sendError(int error) { private void disableResponseEncoding() { if (compressed) { - removeHeader("Content-Encoding"); + setHeader("Content-Encoding", "identity"); } } public void setQueryString(String qs) { From a6ccebd7ead75c70678bf9a193e61dabcb5e2778 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 2 Jun 2022 11:54:21 -0300 Subject: [PATCH 4/5] Restore git ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index ebe4db79e..946cd580f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ target/ *.xlsx -*.db PublicTempStorage/ PrivateTempStorage/ From 5d10c95064db826e0e66f538fa1e95ba095314d5 Mon Sep 17 00:00:00 2001 From: Gonzalo Gallotti Date: Thu, 2 Jun 2022 11:54:40 -0300 Subject: [PATCH 5/5] Restore git ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 946cd580f..5d70c1073 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ target/ *.xlsx - PublicTempStorage/ PrivateTempStorage/ gxexternalproviders/resources/