Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
9b87f528
Commit
9b87f528
authored
Dec 17, 2015
by
astaxie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1494 from astaxie/revert-1489-develop
Revert "go test fixed"
parents
77113e84
c3d1e4d0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
acceptencoder.go
context/acceptencoder.go
+1
-6
staticfile_test.go
staticfile_test.go
+1
-2
No files found.
context/acceptencoder.go
View file @
9b87f528
...
@@ -18,7 +18,6 @@ import (
...
@@ -18,7 +18,6 @@ import (
"bytes"
"bytes"
"compress/flate"
"compress/flate"
"compress/gzip"
"compress/gzip"
"compress/zlib"
"io"
"io"
"net/http"
"net/http"
"os"
"os"
...
@@ -34,11 +33,7 @@ type acceptEncoder struct {
...
@@ -34,11 +33,7 @@ type acceptEncoder struct {
var
(
var
(
noneCompressEncoder
=
acceptEncoder
{
""
,
func
(
wr
io
.
Writer
,
level
int
)
(
io
.
Writer
,
error
)
{
return
wr
,
nil
}}
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
)
}}
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
deflateCompressEncoder
=
acceptEncoder
{
"deflate"
,
func
(
wr
io
.
Writer
,
level
int
)
(
io
.
Writer
,
error
)
{
return
flate
.
NewWriter
(
wr
,
level
)
}}
//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
)
}}
)
)
var
(
var
(
...
...
staticfile_test.go
View file @
9b87f528
...
@@ -4,7 +4,6 @@ import (
...
@@ -4,7 +4,6 @@ import (
"bytes"
"bytes"
"compress/flate"
"compress/flate"
"compress/gzip"
"compress/gzip"
"compress/zlib"
"io"
"io"
"io/ioutil"
"io/ioutil"
"os"
"os"
...
@@ -44,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) {
...
@@ -44,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) {
func
TestOpenStaticFileDeflate_1
(
t
*
testing
.
T
)
{
func
TestOpenStaticFileDeflate_1
(
t
*
testing
.
T
)
{
file
,
_
:=
os
.
Open
(
licenseFile
)
file
,
_
:=
os
.
Open
(
licenseFile
)
var
zipBuf
bytes
.
Buffer
var
zipBuf
bytes
.
Buffer
fileWriter
,
_
:=
zlib
.
NewWriterLevel
(
&
zipBuf
,
flate
.
BestCompression
)
fileWriter
,
_
:=
flate
.
NewWriter
(
&
zipBuf
,
flate
.
BestCompression
)
io
.
Copy
(
fileWriter
,
file
)
io
.
Copy
(
fileWriter
,
file
)
fileWriter
.
Close
()
fileWriter
.
Close
()
content
,
_
:=
ioutil
.
ReadAll
(
&
zipBuf
)
content
,
_
:=
ioutil
.
ReadAll
(
&
zipBuf
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment