diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 16:07:45 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-05-23 16:07:45 +0400 |
| commit | 4959ec482e14884e6c132ed0533c6d62bcc89405 (patch) | |
| tree | 1993d130e544b3672fb4e612f805aaa8af140566 /src/core/ngx_times.c | |
| parent | debb8a42db100ed27e92cd8126b93844c8f9b3a8 (diff) | |
nginx-0.1.33-RELEASE importrelease-0.1.33
*) Bugfix: nginx could not be built with the --without-pcre parameter;
the bug had appeared in 0.1.29.
*) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one
level cause the bus fault on start up.
*) Bugfix: the HTTP protocol was specified in the HTTPS redirects.
*) Bugfix: if the "rewrite" directive used the captures inside the "if"
directive, then the 500 error code was returned.
Diffstat (limited to 'src/core/ngx_times.c')
| -rw-r--r-- | src/core/ngx_times.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index 30938a174..f43987e85 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -155,14 +155,14 @@ ngx_time_update(time_t s) p = cached_http_time[slot]; - ngx_sprintf(p, "%s, %02d %s %4d %02d:%02d:%02d GMT", - week[ngx_cached_gmtime.ngx_tm_wday], - ngx_cached_gmtime.ngx_tm_mday, - months[ngx_cached_gmtime.ngx_tm_mon - 1], - ngx_cached_gmtime.ngx_tm_year, - ngx_cached_gmtime.ngx_tm_hour, - ngx_cached_gmtime.ngx_tm_min, - ngx_cached_gmtime.ngx_tm_sec); + (void) ngx_sprintf(p, "%s, %02d %s %4d %02d:%02d:%02d GMT", + week[ngx_cached_gmtime.ngx_tm_wday], + ngx_cached_gmtime.ngx_tm_mday, + months[ngx_cached_gmtime.ngx_tm_mon - 1], + ngx_cached_gmtime.ngx_tm_year, + ngx_cached_gmtime.ngx_tm_hour, + ngx_cached_gmtime.ngx_tm_min, + ngx_cached_gmtime.ngx_tm_sec); ngx_cached_http_time.data = p; @@ -175,7 +175,7 @@ ngx_time_update(time_t s) #elif (NGX_HAVE_GMTOFF) ngx_localtime(&tm); - ngx_gmtoff = tm.ngx_tm_gmtoff / 60; + ngx_gmtoff = (ngx_int_t) (tm.ngx_tm_gmtoff / 60); #else @@ -187,22 +187,22 @@ ngx_time_update(time_t s) p = cached_err_log_time[slot]; - ngx_sprintf(p, "%4d/%02d/%02d %02d:%02d:%02d", - tm.ngx_tm_year, tm.ngx_tm_mon, - tm.ngx_tm_mday, tm.ngx_tm_hour, - tm.ngx_tm_min, tm.ngx_tm_sec); + (void) ngx_sprintf(p, "%4d/%02d/%02d %02d:%02d:%02d", + tm.ngx_tm_year, tm.ngx_tm_mon, + tm.ngx_tm_mday, tm.ngx_tm_hour, + tm.ngx_tm_min, tm.ngx_tm_sec); ngx_cached_err_log_time.data = p; p = cached_http_log_time[slot]; - ngx_sprintf(p, "%02d/%s/%d:%02d:%02d:%02d %c%02d%02d", - tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1], - tm.ngx_tm_year, tm.ngx_tm_hour, - tm.ngx_tm_min, tm.ngx_tm_sec, - ngx_gmtoff < 0 ? '-' : '+', - abs(ngx_gmtoff / 60), abs(ngx_gmtoff % 60)); + (void) ngx_sprintf(p, "%02d/%s/%d:%02d:%02d:%02d %c%02d%02d", + tm.ngx_tm_mday, months[tm.ngx_tm_mon - 1], + tm.ngx_tm_year, tm.ngx_tm_hour, + tm.ngx_tm_min, tm.ngx_tm_sec, + ngx_gmtoff < 0 ? '-' : '+', + abs(ngx_gmtoff / 60), abs(ngx_gmtoff % 60)); ngx_cached_http_log_time.data = p; |