Mercurial > hg > nginx-vendor-current

diff src/core/ngx_string.c @ 110:dad2fe8ecf08 NGINX_0_3_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.2 *) Feature: the Sun Studio 10 C compiler support. *) Feature: the "proxy_upstream_max_fails", "proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails", and "fastcgi_upstream_fail_timeout" directives.
author Igor Sysoev <http://sysoev.ru>
date Wed, 12 Oct 2005 00:00:00 +0400
parents 45f7329b4bd0
children d25a1d6034f1
line wrap: on
line diff
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -115,6 +115,7 @@ ngx_vsnprintf(u_char *buf, size_t max, c
     uint32_t        ui32;
     int64_t         i64;
     uint64_t        ui64;
+    ngx_msec_t      ms;
     ngx_str_t      *s;
     ngx_uint_t      width, sign, hexadecimal, max_width;
     static u_char   hex[] = "0123456789abcdef";
@@ -221,8 +222,14 @@ ngx_vsnprintf(u_char *buf, size_t max, c
                 break;
 
             case 'M':
-                ui64 = (uint64_t) va_arg(args, ngx_msec_t);
-                sign = 0;
+                ms = (ngx_msec_t) va_arg(args, ngx_msec_t);
+                if ((ngx_msec_int_t) ms == -1) {
+                    sign = 1;
+                    i64 = -1;
+                } else {
+                    sign = 0;
+                    ui64 = (uint64_t) ms;
+                }
                 break;
 
             case 'z':