Merge branch 'develop' of https://github.com/astaxie/beego into develop

context/acceptencoder.go

@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"compress/flate"
 	"compress/gzip"
+	"compress/zlib"
 	"io"
 	"net/http"
 	"os"
@@ -31,9 +32,13 @@ 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) }}
-	deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(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) }}
+	//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) }}
 )
 
 var (

plugins/cors/cors_test.go

@@ -225,8 +225,8 @@ func Benchmark_WithoutCORS(b *testing.B) {
 		ctx.Output.SetStatus(500)
 	})
 	b.ResetTimer()
-	for i := 0; i < 100; i++ {
-		r, _ := http.NewRequest("PUT", "/foo", nil)
+	r, _ := http.NewRequest("PUT", "/foo", nil)
+	for i := 0; i < b.N; i++ {
 		handler.ServeHTTP(recorder, r)
 	}
 }
@@ -246,8 +246,8 @@ func Benchmark_WithCORS(b *testing.B) {
 		ctx.Output.SetStatus(500)
 	})
 	b.ResetTimer()
-	for i := 0; i < 100; i++ {
-		r, _ := http.NewRequest("PUT", "/foo", nil)
+	r, _ := http.NewRequest("PUT", "/foo", nil)
+	for i := 0; i < b.N; i++ {
 		handler.ServeHTTP(recorder, r)
 	}
 }

staticfile_test.go

@@ -2,8 +2,8 @@ package beego
 
 import (
 	"bytes"
-	"compress/flate"
 	"compress/gzip"
+	"compress/zlib"
 	"io"
 	"io/ioutil"
 	"os"
@@ -43,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) {
 func TestOpenStaticFileDeflate_1(t *testing.T) {
 	file, _ := os.Open(licenseFile)
 	var zipBuf bytes.Buffer
-	fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression)
+	fileWriter, _ := zlib.NewWriterLevel(&zipBuf, zlib.BestCompression)
 	io.Copy(fileWriter, file)
 	fileWriter.Close()
 	content, _ := ioutil.ReadAll(&zipBuf)

tree.go

@@ -334,7 +334,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 			}
 		}
 	}
-	if runObject == nil {
+	if runObject == nil && len(t.fixrouters) > 0 {
 		// Filter the .json .xml .html extension
 		for _, str := range allowSuffixExt {
 			if strings.HasSuffix(seg, str) {
@@ -353,11 +353,23 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte
 		runObject = t.wildcard.match(pattern, append(wildcardValues, seg), ctx)
 	}
 
-	if runObject == nil {
-		segments := splitPath(pattern)
+	if runObject == nil && len(t.leaves) > 0 {
 		wildcardValues = append(wildcardValues, seg)
+		start, i := 0, 0
+		for ; i < len(pattern); i++ {
+			if pattern[i] == '/' {
+				if i != 0 && start < len(pattern) {
+					wildcardValues = append(wildcardValues, pattern[start:i])
+				}
+				start = i + 1
+				continue
+			}
+		}
+		if start > 0 {
+			wildcardValues = append(wildcardValues, pattern[start:i])
+		}
 		for _, l := range t.leaves {
-			if ok := l.match(append(wildcardValues, segments...), ctx); ok {
+			if ok := l.match(wildcardValues, ctx); ok {
 				return l.runObject
 			}
 		}