Mercurial > hg > nginx
comparison src/http/modules/ngx_http_userid_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 | 778ef9c3fd2d |
comparison
equal
deleted
inserted
replaced
| 4473:3b877a45d343 | 4474:41f640a693de |
|---|---|
| 772 ucf->expires = 0; | 772 ucf->expires = 0; |
| 773 return NGX_CONF_OK; | 773 return NGX_CONF_OK; |
| 774 } | 774 } |
| 775 | 775 |
| 776 ucf->expires = ngx_parse_time(&value[1], 1); | 776 ucf->expires = ngx_parse_time(&value[1], 1); |
| 777 if (ucf->expires == NGX_ERROR) { | 777 if (ucf->expires == (time_t) NGX_ERROR) { |
| 778 return "invalid value"; | 778 return "invalid value"; |
| 779 } | |
| 780 | |
| 781 if (ucf->expires == NGX_PARSE_LARGE_TIME) { | |
| 782 return "value must be less than 68 years"; | |
| 783 } | 779 } |
| 784 | 780 |
| 785 return NGX_CONF_OK; | 781 return NGX_CONF_OK; |
| 786 } | 782 } |
| 787 | 783 |