diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-13 15:41:11 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-13 15:41:11 +0000 |
| commit | 9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b (patch) | |
| tree | bf812ed61086a3746bb141c3df05ab8b4d2577cc /src/http/ngx_http_upstream.c | |
| parent | 8cb7134f49bcdded469b3e72415b96794190257e (diff) | |
| download | nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.tar.gz nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.tar.bz2 | |
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).
Diffstat (limited to 'src/http/ngx_http_upstream.c')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 8581a946b..4504d9823 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -4268,7 +4268,7 @@ ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) fail_timeout = ngx_parse_time(&s, 1); - if (fail_timeout == NGX_ERROR) { + if (fail_timeout == (time_t) NGX_ERROR) { goto invalid; } |