mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-01 11:19:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed lingering_time check.

Browse Source 
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.
This commit is contained in:
Maxim Dounin 2013-05-13 17:39:45 +04:00
parent dcdf9eed8d
commit 885861b683
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/http/ngx_http_request.c
View File

@ -3166,8 +3166,8 @@ ngx_http_lingering_close_handler(ngx_event_t *rev)
return;
}
timer = (ngx_msec_t) (r->lingering_time - ngx_time());
if (timer <= 0) {
timer = (ngx_msec_t) r->lingering_time - (ngx_msec_t) ngx_time();
if ((ngx_msec_int_t) timer <= 0) {
ngx_http_close_request(r, 0);
return;
}

4
src/http/ngx_http_request_body.c
View File

@ -570,9 +570,9 @@ ngx_http_discarded_request_body_handler(ngx_http_request_t *r)
}
if (r->lingering_time) {
timer = (ngx_msec_t) (r->lingering_time - ngx_time());
timer = (ngx_msec_t) r->lingering_time - (ngx_msec_t) ngx_time();
if (timer <= 0) {
if ((ngx_msec_int_t) timer <= 0) {
r->discard_body = 0;
r->lingering_close = 0;
ngx_http_finalize_request(r, NGX_ERROR);