diff options
| author | zeripath <art27@cantab.net> | 2019-01-23 08:56:51 +0000 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-01-23 10:56:51 +0200 |
| commit | 7d434376f1504ff64f249b879634ac2eec9440da (patch) | |
| tree | 3a722ee5c0ceb64fff959d0431939f8b6b3f8662 /routers/routes | |
| parent | 075649572d4472b588a8484ce3d7c37df7621f85 (diff) | |
| download | gitea-7d434376f1504ff64f249b879634ac2eec9440da.tar.gz gitea-7d434376f1504ff64f249b879634ac2eec9440da.zip | |
Pooled and buffered gzip implementation (#5722)
* Pooled and buffered gzip implementation
* Add test for gzip
* Add integration test
* Ensure lfs check within transaction
The previous code made it possible for a race condition to occur whereby a LFSMetaObject could be checked into the database twice. We should check if the LFSMetaObject is within the database and insert it if not in one transaction.
* Try to avoid primary key problem in postgres
The integration tests are being affected by
https://github.com/go-testfixtures/testfixtures/issues/39 if we set the
primary key high enough, keep a count of this and remove at the end of
each test we shouldn't be affected by this.
Diffstat (limited to 'routers/routes')
| -rw-r--r-- | routers/routes/routes.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/routers/routes/routes.go b/routers/routes/routes.go index a3bf3f753a..c012d5c3c2 100644 --- a/routers/routes/routes.go +++ b/routers/routes/routes.go @@ -14,6 +14,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/gzip" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/metrics" @@ -36,7 +37,6 @@ import ( "github.com/go-macaron/cache" "github.com/go-macaron/captcha" "github.com/go-macaron/csrf" - "github.com/go-macaron/gzip" "github.com/go-macaron/i18n" "github.com/go-macaron/session" "github.com/go-macaron/toolbox" @@ -54,7 +54,7 @@ func NewMacaron() *macaron.Macaron { } m.Use(macaron.Recovery()) if setting.EnableGzip { - m.Use(gzip.Gziper()) + m.Use(gzip.Middleware()) } if setting.Protocol == setting.FCGI { m.SetURLPrefix(setting.AppSubURL) |