Mercurial > hg > nginx-quic
view src/core/ngx_parse.c @ 543:511a89da35ad release-0.2.0
nginx-0.2.0-RELEASE import
*) The pid-file names used during online upgrade was changed and now is
not required a manual rename operation. The old master process adds
the ".oldbin" suffix to its pid-file and executes a new binary file.
The new master process creates usual pid-file without the ".newbin"
suffix. If the master process exits, then old master process renames
back its pid-file with the ".oldbin" suffix to the pid-file without
suffix.
*) Change: the "worker_connections" directive, new name of the
"connections" directive; now the directive specifies maximum number
of connections, but not maximum socket descriptor number.
*) Feature: SSL supports the session cache inside one worker process.
*) Feature: the "satisfy_any" directive.
*) Change: the ngx_http_access_module and ngx_http_auth_basic_module do
not run for subrequests.
*) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending"
directives.
*) Bugfix: if all backend using in load-balancing failed after one
error, then nginx did not try do connect to them during 60 seconds.
*) Bugfix: in IMAP/POP3 command argument parsing.
Thanks to Rob Mueller.
*) Bugfix: errors while using SSL in IMAP/POP3 proxy.
*) Bugfix: errors while using SSI and gzipping.
*) Bugfix: the "Expires" and "Cache-Control" header lines were omitted
from the 304 responses.
Thanks to Alexandr Kukushkin.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 23 Sep 2005 11:02:22 +0000 |
parents | 42d11f017717 |
children | 9c2f3ed7a247 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> ngx_int_t ngx_parse_size(ngx_str_t *line) { u_char last; size_t len; ngx_int_t scale, size; len = line->len; last = line->data[len - 1]; switch (last) { case 'K': case 'k': len--; scale = 1024; break; case 'M': case 'm': len--; scale = 1024 * 1024; break; default: scale = 1; } size = ngx_atoi(line->data, len); if (size == NGX_ERROR) { return NGX_ERROR; } size *= scale; return size; } ngx_int_t ngx_parse_time(ngx_str_t *line, ngx_int_t sec) { size_t len; u_char *start, last; ngx_int_t value, total, scale; ngx_uint_t max, i; enum { st_start = 0, st_year, st_month, st_week, st_day, st_hour, st_min, st_sec, st_msec, st_last } step; start = line->data; len = 0; total = 0; step = sec ? st_start : st_month; for (i = 0; /* void */ ; i++) { if (i < line->len) { if (line->data[i] != ' ') { len++; continue; } if (line->data[i] == ' ' && len == 0) { start = &line->data[i + 1]; continue; } } if (len == 0) { break; } last = line->data[i - 1]; switch (last) { case 'y': if (step > st_start) { return NGX_ERROR; } step = st_year; len--; max = 68; scale = 60 * 60 * 24 * 365; break; case 'M': if (step > st_year) { return NGX_ERROR; } step = st_month; len--; max = 828; scale = 60 * 60 * 24 * 30; break; case 'w': if (step > st_month) { return NGX_ERROR; } step = st_week; len--; max = 3550; scale = 60 * 60 * 24 * 7; break; case 'd': if (step > st_week) { return NGX_ERROR; } step = st_day; len--; max = 24855; scale = 60 * 60 * 24; break; case 'h': if (step > st_day) { return NGX_ERROR; } step = st_hour; len--; max = 596523; scale = 60 * 60; break; case 'm': if (step > st_hour) { return NGX_ERROR; } step = st_min; len--; max = 35791394; scale = 60; break; case 's': len--; if (line->data[i - 2] == 'm') { if (sec || step > st_sec) { return NGX_ERROR; } step = st_msec; len--; max = 2147483647; scale = 1; break; } if (step > st_min) { return NGX_ERROR; } step = st_sec; max = 2147483647; scale = 1; break; default: step = st_last; max = 2147483647; scale = 1; } value = ngx_atoi(start, len); if (value == NGX_ERROR) { return NGX_ERROR; } if (step != st_msec && !sec) { scale *= 1000; max /= 1000; } if ((u_int) value > max) { return NGX_PARSE_LARGE_TIME; } total += value * scale; if ((u_int) total > 2147483647) { return NGX_PARSE_LARGE_TIME; } if (i >= line->len) { break; } len = 0; start = &line->data[i + 1]; } return total; }