Merge pull request #1378 from thaddeusalbers/gzipped_attachment_content_not_gzipped

Fixed gzipped attachment not returning gzipped content.

Author: Hideki Itakura

src/main/java/com/couchbase/lite/internal/AttachmentInternal.java

@@ -211,6 +211,8 @@ public InputStream getContentInputStream() {
         return new ByteArrayInputStream(getContent());
     }
 
+    public InputStream getEncodedContentInputStream() { return new ByteArrayInputStream(getEncodedContent()); }
+
     public URL getContentURL() throws MalformedURLException {
         String path = database.getAttachmentStore().getBlobPathForKey(blobKey);
         return path != null ? new File(path).toURI().toURL() : null;

src/main/java/com/couchbase/lite/router/Router.java

@@ -2054,10 +2054,12 @@ public Status do_GET_Attachment(Database _db, String docID, String _attachmentNa
             if (acceptEncoding != null && acceptEncoding.contains("gzip") &&
                     attachment.getEncoding() == AttachmentInternal.AttachmentEncoding.AttachmentEncodingGZIP) {
                 connection.getResHeader().add("Content-Encoding", "gzip");
+                connection.setResponseInputStream(attachment.getEncodedContentInputStream());
+            }
+            else {
+                connection.setResponseInputStream(attachment.getContentInputStream());
             }
-
             dontOverwriteBody = true;
-            connection.setResponseInputStream(attachment.getContentInputStream());
             return new Status(Status.OK);
 
         } catch (CouchbaseLiteException e) {