From c3d1e4d088eeb217d04e18ac89d5ca1ad0a05899 Mon Sep 17 00:00:00 2001
From: astaxie <xiemengjun@gmail.com>
Date: Thu, 17 Dec 2015 14:45:10 +0800
Subject: [PATCH] Revert "go test fixed"

---
 context/acceptencoder.go | 11 +++--------
 staticfile_test.go       |  3 +--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/context/acceptencoder.go b/context/acceptencoder.go
index 0a0586ac..1bd2cc3d 100644
--- a/context/acceptencoder.go
+++ b/context/acceptencoder.go
@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
-	"compress/zlib"
 	"io"
 	"net/http"
 	"os"
@@ -32,13 +31,9 @@ type acceptEncoder struct {
 }
 
 var (
-	noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }}
-	gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }}
-	//according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed
-	//deflate
-	//The "zlib" format defined in RFC 1950 [31] in combination with
-	//the "deflate" compression mechanism described in RFC 1951 [29].
-	deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }}
+	noneCompressEncoder    = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }}
+	gzipCompressEncoder    = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }}
+	deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }}
 )
 
 var (
diff --git a/staticfile_test.go b/staticfile_test.go
index 097ee07e..e635fcc6 100644
--- a/staticfile_test.go
+++ b/staticfile_test.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
-	"compress/zlib"
 	"io"
 	"io/ioutil"
 	"os"
@@ -44,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) {
 func TestOpenStaticFileDeflate_1(t *testing.T) {
 	file, _ := os.Open(licenseFile)
 	var zipBuf bytes.Buffer
-	fileWriter, _ := zlib.NewWriterLevel(&zipBuf, flate.BestCompression)
+	fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression)
 	io.Copy(fileWriter, file)
 	fileWriter.Close()
 	content, _ := ioutil.ReadAll(&zipBuf)