fix conflicts

This commit is contained in:
Evgeniy Kulikov 2021-02-12 15:24:52 +03:00
parent cbaf9e6142
commit a428a0b1b3
No known key found for this signature in database
GPG key ID: BF6AEE0A2A699BF2
4 changed files with 52 additions and 7 deletions

11
app.go
View file

@ -97,6 +97,17 @@ func newApp(ctx context.Context, opt ...Option) App {
a.web.DisableHeaderNamesNormalizing = true
a.web.NoDefaultServerHeader = true
a.web.NoDefaultContentType = true
a.web.MaxRequestBodySize = a.cfg.GetInt(cfgWebMaxRequestBodySize)
// FIXME don't work with StreamRequestBody,
// some bugs with readMultipartForm
// a.web.DisablePreParseMultipartForm = true
// body streaming
// TODO should be replaced in future with
//
// a.web.StreamRequestBody = v.GetBool(cfgWebStreamRequestBody)
checkAndEnableStreaming(a.log, a.cfg, a.web)
// -- -- -- -- -- -- -- -- -- --
connections := make(map[string]float64)