Merge branch 'adelq'

JuliaWeb · Aug 14, 2015 · 1c7c18f · 1c7c18f
2 parents de5d3fd + 42da843
commit 1c7c18f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -6,3 +6,4 @@ GnuTLS
 Codecs
 JSON
 Compat
+Zlib
diff --git a/src/Requests.jl b/src/Requests.jl
@@ -14,6 +14,7 @@ using URIParser
 using GnuTLS
 using Codecs
 using JSON
+using Zlib
 
 export URI, get, post, put, delete, head, options, patch, FileParam
 
@@ -230,6 +231,9 @@ function process_response(stream, timeout)
         end
     end
     http_parser_execute(rp.parser,rp.settings,"") #EOF
+    if in(get(r.headers,"Content-Encoding",""), ("gzip","deflate"))
+        r.data = bytestring(decompress(r.data))
+    end
     r
 end
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -140,3 +140,7 @@ data = JSON.parse(res.data)
 
 # Test for chunked responses (we expect 100 from split as there are 99 '\n')
 @test size(split(get("http://httpbin.org/stream/99").data, "\n"), 1) == 100
+
+# Test for gzipped responses
+@test JSON.parse(get("http://httpbin.org/gzip").data)["gzipped"] == true
+@test JSON.parse(get("http://httpbin.org/deflate").data)["deflated"] == true