Mercurial > hg > nginx
comparison src/http/modules/ngx_http_headers_filter_module.c @ 4474:41f640a693de
Time parsing cleanup.
Nuke NGX_PARSE_LARGE_TIME, it's not used since 0.6.30. The only error
ngx_parse_time() can currently return is NGX_ERROR, check it explicitly
and make sure to cast it to appropriate type (either time_t or ngx_msec_t)
to avoid signedness warnings on platforms with unsigned time_t (notably QNX).
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 13 Feb 2012 15:41:11 +0000 |
| parents | d620f497c50f |
| children | d11f86a16e3b |
comparison
equal
deleted
inserted
replaced
| 4473:3b877a45d343 | 4474:41f640a693de |
|---|---|
| 528 minus = 0; | 528 minus = 0; |
| 529 } | 529 } |
| 530 | 530 |
| 531 hcf->expires_time = ngx_parse_time(&value[n], 1); | 531 hcf->expires_time = ngx_parse_time(&value[n], 1); |
| 532 | 532 |
| 533 if (hcf->expires_time == NGX_ERROR) { | 533 if (hcf->expires_time == (time_t) NGX_ERROR) { |
| 534 return "invalid value"; | 534 return "invalid value"; |
| 535 } | 535 } |
| 536 | 536 |
| 537 if (hcf->expires == NGX_HTTP_EXPIRES_DAILY | 537 if (hcf->expires == NGX_HTTP_EXPIRES_DAILY |
| 538 && hcf->expires_time > 24 * 60 * 60) | 538 && hcf->expires_time > 24 * 60 * 60) |
| 539 { | 539 { |
| 540 return "daily time value must be less than 24 hours"; | 540 return "daily time value must be less than 24 hours"; |
| 541 } | |
| 542 | |
| 543 if (hcf->expires_time == NGX_PARSE_LARGE_TIME) { | |
| 544 return "value must be less than 68 years"; | |
| 545 } | 541 } |
| 546 | 542 |
| 547 if (minus) { | 543 if (minus) { |
| 548 hcf->expires_time = - hcf->expires_time; | 544 hcf->expires_time = - hcf->expires_time; |
| 549 } | 545 } |