Skip to content

Commit 293319f

Browse files
authored
Merge pull request #231 from devfeel/develop
Version 1.7.12 - fix bug & happy 6.1!
2 parents ce29e16 + e776f60 commit 293319f

5 files changed

Lines changed: 14 additions & 7 deletions

File tree

consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dotweb
33
// Global define
44
const (
55
// Version current version
6-
Version = "1.7.11"
6+
Version = "1.7.12"
77
)
88

99
// Log define

dotweb.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,7 @@ func (app *DotWeb) printDotLogo() {
670670
app.Logger().Print(` / / / / / __ \ / __/| | /| / / / _ \ / __ \`, LogTarget_HttpServer)
671671
app.Logger().Print(` / /_/ / / /_/ // /_ | |/ |/ / / __/ / /_/ /`, LogTarget_HttpServer)
672672
app.Logger().Print(`/_____/ \____/ \__/ |__/|__/ \___/ /_.___/`, LogTarget_HttpServer)
673+
app.Logger().Print(` Happy 6.1`, LogTarget_HttpServer)
673674
}
674675

675676
// Close immediately stops the server.

example/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ func main() {
4343
//设置Session开关
4444
app.HttpServer.SetEnabledSession(true)
4545

46+
app.HttpServer.SetEnabledGzip(true)
47+
4648
//set virtual path
4749
app.HttpServer.SetVirtualPath("/1")
4850

server.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,11 @@ func prepareHttpContext(server *HttpServer, w http.ResponseWriter, req *http.Req
532532

533533
// releaseHttpContext release HttpContext, release gzip writer
534534
func releaseHttpContext(server *HttpServer, httpCtx *HttpContext) {
535+
if server.ServerConfig().EnabledGzip {
536+
var w io.Writer
537+
w = httpCtx.Response().Writer().(*gzipResponseWriter).Writer
538+
w.(*gzip.Writer).Close()
539+
}
535540
// release response
536541
httpCtx.Response().release()
537542
server.pool.response.Put(httpCtx.Response())
@@ -541,10 +546,4 @@ func releaseHttpContext(server *HttpServer, httpCtx *HttpContext) {
541546
// release context
542547
httpCtx.release()
543548
server.pool.context.Put(httpCtx)
544-
545-
if server.ServerConfig().EnabledGzip {
546-
var w io.Writer
547-
w = httpCtx.Response().Writer().(*gzipResponseWriter).Writer
548-
w.(*gzip.Writer).Close()
549-
}
550549
}

version.MD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
## dotweb版本记录:
22

33

4+
#### Version 1.7.12
5+
* fix: fix error when set HttpServer.SetEnabledGzip(true)
6+
* add Happy 6.1 print
7+
* 2020-06-01 23:00 at ShangHai
8+
49
#### Version 1.7.11
510
* Feature: add Tools include some useful functions
611
* Feature: add Tools.PrettyJson used to pretty json format view in text

0 commit comments

Comments
 (0)