support RFC1951 version deflate

Author: Takahiro Hozumi

src/clj_http/util.clj

@@ -3,7 +3,7 @@
   (:import (java.net URLEncoder))
   (:import (org.apache.commons.codec.binary Base64))
   (:import (java.io ByteArrayInputStream ByteArrayOutputStream))
-  (:import (java.util.zip InflaterInputStream DeflaterInputStream
+  (:import (java.util.zip Inflater Deflater InflaterInputStream DeflaterInputStream
                           GZIPInputStream GZIPOutputStream))
   (:import (org.apache.commons.io IOUtils)))
 
@@ -42,11 +42,19 @@
     (.toByteArray baos)))
 
 (defn inflate
-  "Returns a zlib inflate'd version of the given byte array."
+  "Returns a zlib inflate'd version of the given byte array.
+   Try to use RFC1950 first, if failed then RFC1951 next."
   [b]
-  (IOUtils/toByteArray (InflaterInputStream. (ByteArrayInputStream. b))))
+  (try
+    (IOUtils/toByteArray (InflaterInputStream. (ByteArrayInputStream. b)))
+    (catch java.util.zip.ZipException e
+      (IOUtils/toByteArray (InflaterInputStream. (ByteArrayInputStream. b)
+						 (Inflater. true))))))
 
 (defn deflate
   "Returns a deflate'd version of the given byte array."
-  [b]
-  (IOUtils/toByteArray (DeflaterInputStream. (ByteArrayInputStream. b))))
+  ([b]
+     (IOUtils/toByteArray (DeflaterInputStream. (ByteArrayInputStream. b))))
+  ([b nowrap]
+     (IOUtils/toByteArray (DeflaterInputStream. (ByteArrayInputStream. b)
+			    (Deflater. Deflater/DEFAULT_COMPRESSION nowrap)))))

test/clj_http/client_test.clj

@@ -83,42 +83,49 @@
 
 
 (defn compress-handler [req]
-  (case (get-in req [:headers "accept-encoding"])
-     "gzip"
+  (case [(:uri req) (get-in req [:headers "accept-encoding"])]
+     ["/" "gzip"]
        {:body (util/gzip (util/utf8-bytes "foofoofoo"))
 	:headers {"content-encoding" "gzip"}}
-     "gzip, deflate"
+     ["/" "gzip, deflate"]
        {:body (util/gzip (util/utf8-bytes "foofoofoo"))
 	:headers {"content-encoding" "gzip"}}
-     "deflate"
+     ["/" "deflate"]
        {:body (util/deflate (util/utf8-bytes "barbarbar"))
 	:headers {"content-encoding" "deflate"}}
+     ["/rfc1951" "deflate"]
+       {:body (util/deflate (util/utf8-bytes "bazbazbaz") true)
+	:headers {"content-encoding" "deflate"}}
      {:body "foo"}))
 
 (deftest compress-test
   (let [client (client/wrap-decompression compress-handler)]
-    (is (= "foofoofoo" (-> {:headers {"accept-encoding" "gzip"}}
+    (is (= "foofoofoo" (-> {:uri "/", :headers {"accept-encoding" "gzip"}}
+			   client
+			   :body
+			   util/utf8-string)))
+    (is (= "barbarbar" (-> {:uri "/", :headers {"accept-encoding" "deflate"}}
 			   client
 			   :body
 			   util/utf8-string)))
-    (is (= "barbarbar" (-> {:headers {"accept-encoding" "deflate"}}
+    (is (= "bazbazbaz" (-> {:uri "/rfc1951", :headers {"accept-encoding" "deflate"}}
 			   client
 			   :body
 			   util/utf8-string)))
     (is (= "foo" (-> {} client :body)))))
 
 (deftest coerce-compression
   (let [client (client/wrap-coerce-compression compress-handler)]
-    (is (= "gzip" (-> {:headers {"accept-encoding" "gzip"}}
+    (is (= "gzip" (-> {:uri "/", :headers {"accept-encoding" "gzip"}}
 		      client
 		      (get-in [:headers "content-encoding"]))))
-    (is (= "deflate" (-> {:headers {"accept-encoding" "deflate"}}
+    (is (= "deflate" (-> {:uri "/", :headers {"accept-encoding" "deflate"}}
 			 client
 			 (get-in [:headers "content-encoding"]))))
-    (is (= "gzip" (-> {}
+    (is (= "gzip" (-> {:uri "/"}
 		      client
 		      (get-in [:headers "content-encoding"]))))
-    (is (nil? (-> {:headers {"accept-encoding" "identity"}}
+    (is (nil? (-> {:uri "/", :headers {"accept-encoding" "identity"}}
 		  client
 		  (get-in [:headers "content-encoding"]))))))