Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 5210:ea2ba6dbe361
Fixed lingering_time check.
There are two significant changes in this patch:
1) The <= 0 comparison is done with a signed type. This fixes the case
of ngx_time() being larger than r->lingering_time.
2) Calculation of r->lingering_time - ngx_time() is now always done
in the ngx_msec_t type. This ensures the calculation is correct
even if time_t is unsigned and differs in size from ngx_msec_t.
Thanks to Lanshun Zhou.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 13 May 2013 17:39:45 +0400 |
| parents | 9d83ec073c51 |
| children | aadfadd5af2b |
comparison
equal
deleted
inserted
replaced
| 5209:07e515e65984 | 5210:ea2ba6dbe361 |
|---|---|
| 3164 if (rev->timedout) { | 3164 if (rev->timedout) { |
| 3165 ngx_http_close_request(r, 0); | 3165 ngx_http_close_request(r, 0); |
| 3166 return; | 3166 return; |
| 3167 } | 3167 } |
| 3168 | 3168 |
| 3169 timer = (ngx_msec_t) (r->lingering_time - ngx_time()); | 3169 timer = (ngx_msec_t) r->lingering_time - (ngx_msec_t) ngx_time(); |
| 3170 if (timer <= 0) { | 3170 if ((ngx_msec_int_t) timer <= 0) { |
| 3171 ngx_http_close_request(r, 0); | 3171 ngx_http_close_request(r, 0); |
| 3172 return; | 3172 return; |
| 3173 } | 3173 } |
| 3174 | 3174 |
| 3175 do { | 3175 do { |