nginx-0.3.0-RELEASE importrelease-0.3.0

    *) Change: the 10-days live time limit of worker process was
       eliminated. The limit was introduced because of millisecond timers
       overflow.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/core/ngx_string.c b/src/core/ngx_string.c
index 575e60e84..93449abcc 100644
--- a/src/core/ngx_string.c
+++ b/src/core/ngx_string.c
@@ -57,6 +57,7 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src)
  *    %[0][width][u][x|X]L      int64_t/uint64_t
  *    %[0][width|m][u][x|X]A    ngx_atomic_int_t/ngx_atomic_uint_t
  *    %P                        ngx_pid_t
+ *    %M                        ngx_msec_t
  *    %r                        rlim_t
  *    %p                        pointer
  *    %V                        pointer to ngx_str_t
@@ -66,9 +67,6 @@ ngx_pstrdup(ngx_pool_t *pool, ngx_str_t *src)
  *    %c                        char
  *    %%                        %
  *
- *  TODO:
- *    %M                        ngx_msec_t
- *
  *  reserved:
  *    %t                        ptrdiff_t
  *    %S                        null-teminated wchar string
@@ -222,6 +220,11 @@ ngx_vsnprintf(u_char *buf, size_t max, const char *fmt, va_list args)
                 sign = 1;
                 break;
 
+            case 'M':
+                ui64 = (uint64_t) va_arg(args, ngx_msec_t);
+                sign = 0;
+                break;
+
             case 'z':
                 if (sign) {
                     i64 = (int64_t) va_arg(args, ssize_t);