Run of fresh-snapshots for golang-github-go-macaron-gzip
Try this locally (using silver-platter):
debian-svp new-upstream --snapshot golang-github-go-macaron-gzip
Merge these changes:
git pull https://janitor.debian.net/git/golang-github-go-macaron-gzip fresh-snapshots/main
Summary
Merged new upstream version: 0.0~git20151014.0.4938e9b+git20191031.b560950 (was: 0.0~git20151014.0.4938e9b+git20160221.cad1c65).
Diff
diff --git a/.travis.yml b/.travis.yml
index 2774fb3..6579082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,13 @@
sudo: false
language: go
-
go:
- - 1.3
- - 1.4
- - 1.5
- - tip
-
-script: go test -v -cover -race
+ - 1.9.x
+ - 1.10.x
+ - 1.11.x
+ - 1.12.x
+ - 1.13.x
-notifications:
- email:
- - u@gogs.io
+script:
+ - go get golang.org/x/tools/cmd/cover
+ - go get github.com/smartystreets/goconvey
+ - go test -v -cover -race
diff --git a/README.md b/README.md
index 0c438a7..e5a2692 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ Middleware gzip provides compress to responses for [Macaron](https://github.com/
## Getting Help
- [API Reference](https://gowalker.org/github.com/go-macaron/gzip)
-- [Documentation](http://go-macaron.com/docs/middlewares/gzip)
+- [Documentation](https://go-macaron.com/middlewares/gzip)
## Credits
@@ -17,4 +17,4 @@ This package is a modified version of [martini-contrib/gzip](https://github.com/
## License
-This project is under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for the full license text.
\ No newline at end of file
+This project is under the Apache License, Version 2.0. See the [LICENSE](LICENSE) file for the full license text.
diff --git a/debian/changelog b/debian/changelog
index 4063f09..6b04449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-golang-github-go-macaron-gzip (0.0~git20151014.0.4938e9b-3) UNRELEASED; urgency=medium
+golang-github-go-macaron-gzip (0.0~git20151014.0.4938e9b+git20191031.b560950-1) UNRELEASED; urgency=medium
+ [ Alexandre Viau ]
* Point Vcs-* urls to salsa.debian.org.
- -- Alexandre Viau <aviau@debian.org> Mon, 02 Apr 2018 16:54:38 -0400
+ [ Debian Janitor ]
+ * New upstream snapshot.
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Sun, 26 Jan 2020 14:26:12 +0000
golang-github-go-macaron-gzip (0.0~git20151014.0.4938e9b-2) unstable; urgency=medium
diff --git a/gzip.go b/gzip.go
index ca54ec6..296c0e3 100644
--- a/gzip.go
+++ b/gzip.go
@@ -86,7 +86,10 @@ func Gziper(options ...Options) macaron.Handler {
gzw := gzipResponseWriter{gz, ctx.Resp}
ctx.Resp = gzw
ctx.MapTo(gzw, (*http.ResponseWriter)(nil))
- if ctx.Render != nil {
+
+ // Check if render middleware has been registered,
+ // if yes, we need to modify ResponseWriter for it as well.
+ if _, ok := ctx.Render.(*macaron.DummyRender); !ok {
ctx.Render.SetResponseWriter(gzw)
}