aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_busy_lock.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-02-13 15:41:11 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-02-13 15:41:11 +0000
commit9f38b20db50a22b434d35c9bf3c5b08d5ddfbd8b (patch)
treebf812ed61086a3746bb141c3df05ab8b4d2577cc /src/http/ngx_http_busy_lock.c
parent8cb7134f49bcdded469b3e72415b96794190257e (diff)
downloadnginx-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/http/ngx_http_busy_lock.c')
-rw-r--r--src/http/ngx_http_busy_lock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_busy_lock.c b/src/http/ngx_http_busy_lock.c
index 35a03acaa..cd8e07cd6 100644
--- a/src/http/ngx_http_busy_lock.c
+++ b/src/http/ngx_http_busy_lock.c
@@ -274,7 +274,7 @@ char *ngx_http_set_busy_lock_slot(ngx_conf_t *cf, ngx_command_t *cmd,
line.data = value[i].data + 2;
bl->timeout = ngx_parse_time(&line, 1);
- if (bl->timeout == NGX_ERROR) {
+ if (bl->timeout == (time_t) NGX_ERROR) {
invalid = 1;
break;
}