Changeset 15742 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2020-01-20T23:18:42+01:00 (4 years ago)

Author:

simon04

Message:

HttpClient: add support for Content-Encoding: deflate

File:

• trunk/src/org/openstreetmap/josm/tools/HttpClient.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -23 +23 @@
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.InflaterInputStream;
 
 import org.openstreetmap.josm.data.validation.routines.DomainValidator;
@@ -112 +113 @@
         }
         this.requestMethod = requestMethod;
-        this.headers.put("Accept-Encoding", "gzip");
+        this.headers.put("Accept-Encoding", "gzip, deflate");
     }
 
@@ -376 +377 @@
             InputStream in = getInputStream();
             in = new ProgressInputStream(in, getContentLength(), monitor);
-            in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            in = "gzip".equalsIgnoreCase(getContentEncoding())
+                    ? new GZIPInputStream(in)
+                    : "deflate".equalsIgnoreCase(getContentEncoding())
+                    ? new InflaterInputStream(in)
+                    : in;
             Compression compression = Compression.NONE;
             if (uncompress) {