Unverified Commit caf2b13c authored by bnorick's avatar bnorick Committed by GitHub
Browse files

Fix infinite keep_alive (#2480)

parent 1d263449
...@@ -415,8 +415,7 @@ func (d *Duration) UnmarshalJSON(b []byte) (err error) { ...@@ -415,8 +415,7 @@ func (d *Duration) UnmarshalJSON(b []byte) (err error) {
switch t := v.(type) { switch t := v.(type) {
case float64: case float64:
if t < 0 { if t < 0 {
t = math.MaxFloat64 d.Duration = time.Duration(math.MaxInt64)
d.Duration = time.Duration(t)
} else { } else {
d.Duration = time.Duration(t * float64(time.Second)) d.Duration = time.Duration(t * float64(time.Second))
} }
...@@ -426,8 +425,7 @@ func (d *Duration) UnmarshalJSON(b []byte) (err error) { ...@@ -426,8 +425,7 @@ func (d *Duration) UnmarshalJSON(b []byte) (err error) {
return err return err
} }
if d.Duration < 0 { if d.Duration < 0 {
mf := math.MaxFloat64 d.Duration = time.Duration(math.MaxInt64)
d.Duration = time.Duration(mf)
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment