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/mail/ngx_mail_core_module.c | |
| parent | 8cb7134f49bcdded469b3e72415b96794190257e (diff) | |
| download | nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.tar.gz nginx-9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b.zip | |
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/mail/ngx_mail_core_module.c')
| -rw-r--r-- | src/mail/ngx_mail_core_module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index 2fb537a25..52a536936 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -479,7 +479,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) s.len = p - s.data; ls->tcp_keepidle = ngx_parse_time(&s, 1); - if (ls->tcp_keepidle == NGX_ERROR) { + if (ls->tcp_keepidle == (time_t) NGX_ERROR) { goto invalid_so_keepalive; } } @@ -495,7 +495,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) s.len = p - s.data; ls->tcp_keepintvl = ngx_parse_time(&s, 1); - if (ls->tcp_keepintvl == NGX_ERROR) { + if (ls->tcp_keepintvl == (time_t) NGX_ERROR) { goto invalid_so_keepalive; } } |