# HG changeset patch # User Igor Sysoev # Date 1304366400 -14400 # Node ID 8dc007eddbcf0395244b64be4bf4f64d03cc1596 # Parent 00d13b6d4ebd225f94a2e2a3afa7dbd3ddfe4ed7 nginx 1.0.1 *) Change: now the "split_clients" directive uses MurmurHash2 algorithm because of better distribution. Thanks to Oleg Mamontov. *) Change: now long strings starting with zero are not considered as false values. Thanks to Maxim Dounin. *) Change: now nginx uses a default listen backlog value 511 on Linux. *) Feature: the $upstream_... variables may be used in the SSI and perl modules. *) Bugfix: now nginx limits better disk cache size. Thanks to Oleg Mamontov. *) Bugfix: a segmentation fault might occur while parsing incorrect IPv4 address; the bug had appeared in 0.9.3. Thanks to Maxim Dounin. *) Bugfix: nginx could not be built by gcc 4.6 without --with-debug option. *) Bugfix: nginx could not be built on Solaris 9 and earlier; the bug had appeared in 0.9.3. Thanks to Dagobert Michelsen. *) Bugfix: $request_time variable had invalid values if subrequests were used; the bug had appeared in 0.8.47. Thanks to Igor A. Valcov. diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,38 @@ +Changes with nginx 1.0.1 03 May 2011 + + *) Change: now the "split_clients" directive uses MurmurHash2 algorithm + because of better distribution. + Thanks to Oleg Mamontov. + + *) Change: now long strings starting with zero are not considered as + false values. + Thanks to Maxim Dounin. + + *) Change: now nginx uses a default listen backlog value 511 on Linux. + + *) Feature: the $upstream_... variables may be used in the SSI and perl + modules. + + *) Bugfix: now nginx limits better disk cache size. + Thanks to Oleg Mamontov. + + *) Bugfix: a segmentation fault might occur while parsing incorrect + IPv4 address; the bug had appeared in 0.9.3. + Thanks to Maxim Dounin. + + *) Bugfix: nginx could not be built by gcc 4.6 without --with-debug + option. + + *) Bugfix: nginx could not be built on Solaris 9 and earlier; the bug + had appeared in 0.9.3. + Thanks to Dagobert Michelsen. + + *) Bugfix: $request_time variable had invalid values if subrequests + were used; the bug had appeared in 0.8.47. + Thanks to Igor A. Valcov. + + Changes with nginx 1.0.0 12 Apr 2011 *) Bugfix: a cache manager might hog CPU after reload. diff --git a/CHANGES.ru b/CHANGES.ru --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,39 @@ +Изменения в nginx 1.0.1 03.05.2011 + + *) Изменение: теперь директива split_clients использует алгоритм + MurmurHash2 из-за лучшего распределения. + Спасибо Олегу Мамонтову. + + *) Изменение: теперь длинные строки, начинающиеся с нуля, не считаются + ложными значениями. + Спасибо Максиму Дунину. + + *) Изменение: теперь по умолчанию nginx использует значение 511 для + listen backlog на Linux. + + *) Добавление: переменные $upstream_... можно использовать в SSI и + перловом модулях. + + *) Исправление: теперь nginx лучше ограничивает размер кэша на + диске. + Спасибо Олегу Мамонтову. + + *) Исправление: при парсинге неправильного IPv4 адреса мог произойти + segmentation fault; ошибка появилась в 0.8.22. + Спасибо Максиму Дунину. + + *) Исправление: nginx не собирался gcc 4.6 без параметра --with-debug. + + *) Исправление: nginx не собирался на Solaris 9 и более ранних; ошибка + появилась в 0.9.3. + Спасибо Dagobert Michelsen. + + *) Исправление: переменная $request_time имела неверные значения, если + использовались подзапросы; ошибка появилась в 0.8.47. + Спасибо Игорю А. Валькову. + + Изменения в nginx 1.0.0 12.04.2011 *) Исправление: cache manager мог нагружать процессор после diff --git a/auto/lib/conf b/auto/lib/conf --- a/auto/lib/conf +++ b/auto/lib/conf @@ -29,6 +29,7 @@ if [ $USE_MD5 = YES ]; then if [ $USE_OPENSSL = YES ]; then have=NGX_HAVE_OPENSSL_MD5_H . auto/have have=NGX_OPENSSL_MD5 . auto/have + have=NGX_HAVE_MD5 . auto/have MD5=YES MD5_LIB=OpenSSL diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf --- a/auto/lib/md5/conf +++ b/auto/lib/md5/conf @@ -14,6 +14,7 @@ if [ $MD5 != NONE ]; then OPENSSL_MD5=NO fi + have=NGX_HAVE_MD5 . auto/have CORE_INCS="$CORE_INCS $MD5" case "$NGX_CC_NAME" in @@ -51,7 +52,7 @@ else # FreeBSD, Solaris 10 ngx_feature="system md library" - ngx_feature_name= + ngx_feature_name=NGX_HAVE_MD5 ngx_feature_run=no ngx_feature_incs="#include " ngx_feature_path= @@ -87,6 +88,7 @@ else if [ $ngx_found = yes ]; then have=NGX_HAVE_OPENSSL_MD5_H . auto/have + have=NGX_HAVE_MD5 . auto/have fi fi @@ -97,17 +99,4 @@ else fi fi - if [ $MD5 != YES ]; then -cat << END - -$0: error: the HTTP cache module requires md5 functions -from OpenSSL library. You can either disable the module by using ---without-http-cache option, or install the OpenSSL library into the system, -or build the OpenSSL library statically from the source with nginx by using ---with-http_ssl_module --with-openssl= options. - -END - exit 1 - fi - fi diff --git a/auto/sources b/auto/sources --- a/auto/sources +++ b/auto/sources @@ -22,6 +22,7 @@ CORE_DEPS="src/core/nginx.h \ src/core/ngx_file.h \ src/core/ngx_crc.h \ src/core/ngx_crc32.h \ + src/core/ngx_murmurhash.h \ src/core/ngx_md5.h \ src/core/ngx_sha1.h \ src/core/ngx_rbtree.h \ @@ -50,6 +51,8 @@ CORE_SRCS="src/core/nginx.c \ src/core/ngx_inet.c \ src/core/ngx_file.c \ src/core/ngx_crc32.c \ + src/core/ngx_murmurhash.c \ + src/core/ngx_md5.c \ src/core/ngx_rbtree.c \ src/core/ngx_radix_tree.c \ src/core/ngx_slab.c \ diff --git a/auto/summary b/auto/summary --- a/auto/summary +++ b/auto/summary @@ -51,6 +51,7 @@ esac case $MD5 in YES) echo " + md5: using $MD5_LIB library" ;; NONE) echo " + md5 library is not used" ;; + NO) echo " + using builtin md5 code" ;; *) echo " + using md5 library: $MD5" ;; esac diff --git a/auto/unix b/auto/unix --- a/auto/unix +++ b/auto/unix @@ -141,14 +141,19 @@ if [ $ngx_found = no ]; then ngx_feature_name=NGX_SYS_NERR ngx_feature_run=value ngx_feature_incs='#include + #include ' #include ' ngx_feature_path= ngx_feature_libs= ngx_feature_test='int n; + char *p; for (n = 1; n < 1000; n++) { errno = 0; - strerror(n); - if (errno == EINVAL) { + p = strerror(n); + if (errno == EINVAL + || p == NULL + || strncmp(p, "Unknown error", 13) == 0) + { printf("%d", n); return 0; } diff --git a/src/core/nginx.h b/src/core/nginx.h --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,8 +8,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1000000 -#define NGINX_VERSION "1.0.0" +#define nginx_version 1000001 +#define NGINX_VERSION "1.0.1" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h --- a/src/core/ngx_core.h +++ b/src/core/ngx_core.h @@ -58,6 +58,7 @@ typedef void (*ngx_connection_handler_pt #include #include #include +#include #if (NGX_PCRE) #include #endif diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -110,7 +110,7 @@ ngx_inet6_addr(u_char *p, size_t len, u_ } if (c == '.' && nibbles) { - if (n < 2) { + if (n < 2 || digit == NULL) { return NGX_ERROR; } diff --git a/src/core/ngx_md5.c b/src/core/ngx_md5.c new file mode 100644 --- /dev/null +++ b/src/core/ngx_md5.c @@ -0,0 +1,289 @@ + +/* + * An internal implementation, based on Alexander Peslyak's + * public domain implementation: + * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5 + * It is not expected to be optimal and is used only + * if no MD5 implementation was found in system. + */ + + +#include +#include +#include + + +#if !(NGX_HAVE_MD5) + +static const u_char *ngx_md5_body(ngx_md5_t *ctx, const u_char *data, + size_t size); + + +void +ngx_md5_init(ngx_md5_t *ctx) +{ + ctx->a = 0x67452301; + ctx->b = 0xefcdab89; + ctx->c = 0x98badcfe; + ctx->d = 0x10325476; + + ctx->bytes = 0; +} + + +void +ngx_md5_update(ngx_md5_t *ctx, const u_char *data, size_t size) +{ + size_t used, free; + + used = ctx->bytes & 0x3f; + ctx->bytes += size; + + if (used) { + free = 64 - used; + + if (size < free) { + ngx_memcpy(&ctx->buffer[used], data, size); + return; + } + + ngx_memcpy(&ctx->buffer[used], data, free); + data = (u_char *)data + free; + size -= free; + (void) ngx_md5_body(ctx, ctx->buffer, 64); + } + + if (size >= 64) { + data = ngx_md5_body(ctx, data, size & ~(size_t) 0x3f); + size &= 0x3f; + } + + ngx_memcpy(ctx->buffer, data, size); +} + + +void +ngx_md5_final(u_char result[16], ngx_md5_t *ctx) +{ + size_t used, free; + + used = ctx->bytes & 0x3f; + + ctx->buffer[used++] = 0x80; + + free = 64 - used; + + if (free < 8) { + ngx_memzero(&ctx->buffer[used], free); + (void) ngx_md5_body(ctx, ctx->buffer, 64); + used = 0; + free = 64; + } + + ngx_memzero(&ctx->buffer[used], free - 8); + + ctx->bytes <<= 3; + ctx->buffer[56] = ctx->bytes; + ctx->buffer[57] = ctx->bytes >> 8; + ctx->buffer[58] = ctx->bytes >> 16; + ctx->buffer[59] = ctx->bytes >> 24; + ctx->buffer[60] = ctx->bytes >> 32; + ctx->buffer[61] = ctx->bytes >> 40; + ctx->buffer[62] = ctx->bytes >> 48; + ctx->buffer[63] = ctx->bytes >> 56; + + (void) ngx_md5_body(ctx, ctx->buffer, 64); + + result[0] = ctx->a; + result[1] = ctx->a >> 8; + result[2] = ctx->a >> 16; + result[3] = ctx->a >> 24; + result[4] = ctx->b; + result[5] = ctx->b >> 8; + result[6] = ctx->b >> 16; + result[7] = ctx->b >> 24; + result[8] = ctx->c; + result[9] = ctx->c >> 8; + result[10] = ctx->c >> 16; + result[11] = ctx->c >> 24; + result[12] = ctx->d; + result[13] = ctx->d >> 8; + result[14] = ctx->d >> 16; + result[15] = ctx->d >> 24; + + ngx_memzero(ctx, sizeof(*ctx)); +} + + +/* + * The basic MD5 functions. + * + * F and G are optimized compared to their RFC 1321 definitions for + * architectures that lack an AND-NOT instruction, just like in + * Colin Plumb's implementation. + */ + +#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) +#define G(x, y, z) ((y) ^ ((z) & ((x) ^ (y)))) +#define H(x, y, z) ((x) ^ (y) ^ (z)) +#define I(x, y, z) ((y) ^ ((x) | ~(z))) + +/* + * The MD5 transformation for all four rounds. + */ + +#define STEP(f, a, b, c, d, x, t, s) \ + (a) += f((b), (c), (d)) + (x) + (t); \ + (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \ + (a) += (b) + +/* + * SET() reads 4 input bytes in little-endian byte order and stores them + * in a properly aligned word in host byte order. + * + * The check for little-endian architectures that tolerate unaligned + * memory accesses is just an optimization. Nothing will break if it + * does not work. + */ + +#if (NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED) + +#define SET(n) (*(uint32_t *) &p[n * 4]) +#define GET(n) (*(uint32_t *) &p[n * 4]) + +#else + +#define SET(n) \ + (block[n] = \ + (uint32_t) p[n * 4] | \ + ((uint32_t) p[n * 4 + 1] << 8) | \ + ((uint32_t) p[n * 4 + 2] << 16) | \ + ((uint32_t) p[n * 4 + 3] << 24)) + +#define GET(n) block[n] + +#endif + + +/* + * This processes one or more 64-byte data blocks, but does not update + * the bit counters. There are no alignment requirements. + */ + +static const u_char * +ngx_md5_body(ngx_md5_t *ctx, const u_char *data, size_t size) +{ + uint32_t a, b, c, d; + uint32_t saved_a, saved_b, saved_c, saved_d; + const u_char *p; +#if !(NGX_HAVE_LITTLE_ENDIAN && NGX_HAVE_NONALIGNED) + uint32_t block[16]; +#endif + + p = data; + + a = ctx->a; + b = ctx->b; + c = ctx->c; + d = ctx->d; + + do { + saved_a = a; + saved_b = b; + saved_c = c; + saved_d = d; + + /* Round 1 */ + + STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7); + STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12); + STEP(F, c, d, a, b, SET(2), 0x242070db, 17); + STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22); + STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7); + STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12); + STEP(F, c, d, a, b, SET(6), 0xa8304613, 17); + STEP(F, b, c, d, a, SET(7), 0xfd469501, 22); + STEP(F, a, b, c, d, SET(8), 0x698098d8, 7); + STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12); + STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17); + STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22); + STEP(F, a, b, c, d, SET(12), 0x6b901122, 7); + STEP(F, d, a, b, c, SET(13), 0xfd987193, 12); + STEP(F, c, d, a, b, SET(14), 0xa679438e, 17); + STEP(F, b, c, d, a, SET(15), 0x49b40821, 22); + + /* Round 2 */ + + STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5); + STEP(G, d, a, b, c, GET(6), 0xc040b340, 9); + STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14); + STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20); + STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5); + STEP(G, d, a, b, c, GET(10), 0x02441453, 9); + STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14); + STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20); + STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5); + STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9); + STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14); + STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20); + STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5); + STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9); + STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14); + STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20); + + /* Round 3 */ + + STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4); + STEP(H, d, a, b, c, GET(8), 0x8771f681, 11); + STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16); + STEP(H, b, c, d, a, GET(14), 0xfde5380c, 23); + STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4); + STEP(H, d, a, b, c, GET(4), 0x4bdecfa9, 11); + STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16); + STEP(H, b, c, d, a, GET(10), 0xbebfbc70, 23); + STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4); + STEP(H, d, a, b, c, GET(0), 0xeaa127fa, 11); + STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16); + STEP(H, b, c, d, a, GET(6), 0x04881d05, 23); + STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4); + STEP(H, d, a, b, c, GET(12), 0xe6db99e5, 11); + STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16); + STEP(H, b, c, d, a, GET(2), 0xc4ac5665, 23); + + /* Round 4 */ + + STEP(I, a, b, c, d, GET(0), 0xf4292244, 6); + STEP(I, d, a, b, c, GET(7), 0x432aff97, 10); + STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15); + STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21); + STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6); + STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10); + STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15); + STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21); + STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6); + STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10); + STEP(I, c, d, a, b, GET(6), 0xa3014314, 15); + STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21); + STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6); + STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10); + STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15); + STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21); + + a += saved_a; + b += saved_b; + c += saved_c; + d += saved_d; + + p += 64; + + } while (size -= 64); + + ctx->a = a; + ctx->b = b; + ctx->c = c; + ctx->d = d; + + return p; +} + +#endif diff --git a/src/core/ngx_md5.h b/src/core/ngx_md5.h --- a/src/core/ngx_md5.h +++ b/src/core/ngx_md5.h @@ -12,6 +12,8 @@ #include +#if (NGX_HAVE_MD5) + #if (NGX_HAVE_OPENSSL_MD5_H) #include #else @@ -37,4 +39,21 @@ typedef MD5_CTX ngx_md5_t; #endif +#else /* !NGX_HAVE_MD5 */ + + +typedef struct { + uint64_t bytes; + uint32_t a, b, c, d; + u_char buffer[64]; +} ngx_md5_t; + + +void ngx_md5_init(ngx_md5_t *ctx); +void ngx_md5_update(ngx_md5_t *ctx, const u_char *data, size_t size); +void ngx_md5_final(u_char result[16], ngx_md5_t *ctx); + + +#endif + #endif /* _NGX_MD5_H_INCLUDED_ */ diff --git a/src/core/ngx_murmurhash.c b/src/core/ngx_murmurhash.c new file mode 100644 --- /dev/null +++ b/src/core/ngx_murmurhash.c @@ -0,0 +1,50 @@ + +/* + * Copyright (C) Austin Appleby + */ + + +#include +#include + + +uint32_t +ngx_murmur_hash2(u_char *data, size_t len) +{ + uint32_t h, k; + + h = 0 ^ len; + + while (len >= 4) { + k = data[0]; + k |= data[1] << 8; + k |= data[2] << 16; + k |= data[3] << 24; + + k *= 0x5bd1e995; + k ^= k >> 24; + k *= 0x5bd1e995; + + h *= 0x5bd1e995; + h ^= k; + + data += 4; + len -= 4; + } + + switch (len) { + case 3: + h ^= data[2] << 16; + case 2: + h ^= data[1] << 8; + case 1: + h ^= data[0]; + h *= 0x5bd1e995; + } + + h ^= h >> 13; + h *= 0x5bd1e995; + h ^= h >> 15; + + return h; +} diff --git a/src/core/ngx_murmurhash.h b/src/core/ngx_murmurhash.h new file mode 100644 --- /dev/null +++ b/src/core/ngx_murmurhash.h @@ -0,0 +1,18 @@ + +/* + * Copyright (C) Igor Sysoev + */ + + +#ifndef _NGX_MURMURHASH_H_INCLUDED_ +#define _NGX_MURMURHASH_H_INCLUDED_ + + +#include +#include + + +uint32_t ngx_murmur_hash2(u_char *data, size_t len); + + +#endif /* _NGX_CRC_H_INCLUDED_ */ diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -155,6 +155,7 @@ ngx_open_cached_file(ngx_open_file_cache of->uniq = ngx_file_uniq(&fi); of->mtime = ngx_file_mtime(&fi); of->size = ngx_file_size(&fi); + of->fs_size = ngx_file_fs_size(&fi); of->is_dir = ngx_is_dir(&fi); of->is_file = ngx_is_file(&fi); of->is_link = ngx_is_link(&fi); @@ -557,6 +558,7 @@ done: of->uniq = ngx_file_uniq(&fi); of->mtime = ngx_file_mtime(&fi); of->size = ngx_file_size(&fi); + of->fs_size = ngx_file_fs_size(&fi); of->is_dir = ngx_is_dir(&fi); of->is_file = ngx_is_file(&fi); of->is_link = ngx_is_link(&fi); diff --git a/src/core/ngx_open_file_cache.h b/src/core/ngx_open_file_cache.h --- a/src/core/ngx_open_file_cache.h +++ b/src/core/ngx_open_file_cache.h @@ -20,6 +20,7 @@ typedef struct { ngx_file_uniq_t uniq; time_t mtime; off_t size; + off_t fs_size; off_t directio; size_t read_ahead; diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -1422,7 +1422,7 @@ ngx_resolver_process_ptr(ngx_resolver_t in_addr_t addr; ngx_int_t digit; ngx_str_t name; - ngx_uint_t i, mask, qtype, qclass, qident; + ngx_uint_t i, mask, qident; ngx_resolver_an_t *an; ngx_resolver_ctx_t *ctx, *next; ngx_resolver_node_t *rn; @@ -1514,12 +1514,12 @@ ngx_resolver_process_ptr(ngx_resolver_t an = (ngx_resolver_an_t *) &buf[i + 2]; - qtype = (an->type_hi << 8) + an->type_lo; - qclass = (an->class_hi << 8) + an->class_lo; len = (an->len_hi << 8) + an->len_lo; ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, - "resolver qt:%ui cl:%ui len:%uz", qtype, qclass, len); + "resolver qt:%ui cl:%ui len:%uz", + (an->type_hi << 8) + an->type_lo, + (an->class_hi << 8) + an->class_lo, len); i += 2 + sizeof(ngx_resolver_an_t); diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -518,7 +518,6 @@ ngx_epoll_process_events(ngx_cycle_t *cy ngx_int_t instance, i; ngx_uint_t level; ngx_err_t err; - ngx_log_t *log; ngx_event_t *rev, *wev, **queue; ngx_connection_t *c; @@ -565,8 +564,6 @@ ngx_epoll_process_events(ngx_cycle_t *cy ngx_mutex_lock(ngx_posted_events_mutex); - log = cycle->log; - for (i = 0; i < events; i++) { c = event_list[i].data.ptr; @@ -587,25 +584,21 @@ ngx_epoll_process_events(ngx_cycle_t *cy continue; } -#if (NGX_DEBUG0) - log = c->log ? c->log : cycle->log; -#endif - revents = event_list[i].events; - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll: fd:%d ev:%04XD d:%p", c->fd, revents, event_list[i].data.ptr); if (revents & (EPOLLERR|EPOLLHUP)) { - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll_wait() error on fd:%d ev:%04XD", c->fd, revents); } #if 0 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { - ngx_log_error(NGX_LOG_ALERT, log, 0, + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "strange epoll_wait() events fd:%d ev:%04XD", c->fd, revents); } diff --git a/src/http/modules/ngx_http_split_clients_module.c b/src/http/modules/ngx_http_split_clients_module.c --- a/src/http/modules/ngx_http_split_clients_module.c +++ b/src/http/modules/ngx_http_split_clients_module.c @@ -87,7 +87,7 @@ ngx_http_split_clients_variable(ngx_http return NGX_OK; } - hash = ngx_crc32_short(val.data, val.len); + hash = ngx_murmur_hash2(val.data, val.len); part = ctx->parts.elts; diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -48,7 +48,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '1.0.0'; +our $VERSION = '1.0.1'; require XSLoader; XSLoader::load('nginx', $VERSION); diff --git a/src/http/ngx_http_cache.h b/src/http/ngx_http_cache.h --- a/src/http/ngx_http_cache.h +++ b/src/http/ngx_http_cache.h @@ -50,7 +50,7 @@ typedef struct { time_t expire; time_t valid_sec; size_t body_start; - off_t length; + off_t fs_size; } ngx_http_file_cache_node_t; @@ -68,6 +68,7 @@ struct ngx_http_cache_s { size_t header_start; size_t body_start; off_t length; + off_t fs_size; ngx_uint_t min_uses; ngx_uint_t error; diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2281,8 +2281,8 @@ ngx_http_subrequest(ngx_http_request_t * sr->uri_changes = NGX_HTTP_MAX_URI_CHANGES + 1; tp = ngx_timeofday(); - r->start_sec = tp->sec; - r->start_msec = tp->msec; + sr->start_sec = tp->sec; + sr->start_msec = tp->msec; r->main->subrequests++; r->main->count++; diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -349,6 +349,7 @@ ngx_http_file_cache_open(ngx_http_reques c->file.log = r->connection->log; c->uniq = of.uniq; c->length = of.size; + c->fs_size = (of.fs_size + cache->bsize - 1) / cache->bsize; c->buf = ngx_create_temp_buf(r->pool, c->body_start); if (c->buf == NULL) { @@ -411,7 +412,7 @@ ngx_http_file_cache_read(ngx_http_reques c->node->exists = 1; c->node->uniq = c->uniq; - cache->sh->size += (c->length + cache->bsize - 1) / cache->bsize; + cache->sh->size += c->fs_size; } ngx_shmtx_unlock(&cache->shpool->mutex); @@ -594,7 +595,7 @@ renew: fcn->valid_sec = 0; fcn->uniq = 0; fcn->body_start = 0; - fcn->length = 0; + fcn->fs_size = 0; done: @@ -777,7 +778,7 @@ ngx_http_file_cache_set_header(ngx_http_ void ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf) { - off_t size, length; + off_t fs_size; ngx_int_t rc; ngx_file_uniq_t uniq; ngx_file_info_t fi; @@ -800,7 +801,7 @@ ngx_http_file_cache_update(ngx_http_requ cache = c->file_cache; uniq = 0; - length = 0; + fs_size = 0; ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http file cache rename: \"%s\" to \"%s\"", @@ -825,23 +826,18 @@ ngx_http_file_cache_update(ngx_http_requ } else { uniq = ngx_file_uniq(&fi); - length = ngx_file_size(&fi); + fs_size = (ngx_file_fs_size(&fi) + cache->bsize - 1) / cache->bsize; } } - size = (length + cache->bsize - 1) / cache->bsize; - ngx_shmtx_lock(&cache->shpool->mutex); c->node->count--; c->node->uniq = uniq; c->node->body_start = c->body_start; - size = size - (c->node->length + cache->bsize - 1) / cache->bsize; - - c->node->length = length; - - cache->sh->size += size; + cache->sh->size += fs_size - c->node->fs_size; + c->node->fs_size = fs_size; if (rc == NGX_OK) { c->node->exists = 1; @@ -1148,7 +1144,7 @@ ngx_http_file_cache_delete(ngx_http_file fcn = ngx_queue_data(q, ngx_http_file_cache_node_t, queue); if (fcn->exists) { - cache->sh->size -= (fcn->length + cache->bsize - 1) / cache->bsize; + cache->sh->size -= fcn->fs_size; path = cache->path; p = name + path->name.len + 1 + path->len; @@ -1371,6 +1367,8 @@ ngx_http_file_cache_add_file(ngx_tree_ct return NGX_ERROR; } + cache = ctx->data; + if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno, ngx_fd_info_n " \"%s\" failed", name->data); @@ -1381,6 +1379,7 @@ ngx_http_file_cache_add_file(ngx_tree_ct c.valid_msec = h.valid_msec; c.body_start = h.body_start; c.length = ngx_file_size(&fi); + c.fs_size = (ngx_file_fs_size(&fi) + cache->bsize - 1) / cache->bsize; } if (ngx_close_file(fd) == NGX_FILE_ERROR) { @@ -1406,8 +1405,6 @@ ngx_http_file_cache_add_file(ngx_tree_ct c.key[i] = (u_char) n; } - cache = ctx->data; - return ngx_http_file_cache_add(cache, &c); } @@ -1447,9 +1444,9 @@ ngx_http_file_cache_add(ngx_http_file_ca fcn->uniq = c->uniq; fcn->valid_sec = c->valid_sec; fcn->body_start = c->body_start; - fcn->length = c->length; + fcn->fs_size = c->fs_size; - cache->sh->size += (c->length + cache->bsize - 1) / cache->bsize; + cache->sh->size += c->fs_size; } else { ngx_queue_remove(&fcn->queue); diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c --- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -265,7 +265,7 @@ ngx_http_test_predicates(ngx_http_reques return NGX_ERROR; } - if (val.len && val.data[0] != '0') { + if (val.len && (val.len != 1 || val.data[0] != '0')) { return NGX_DECLINED; } } @@ -1395,7 +1395,7 @@ ngx_http_script_if_code(ngx_http_script_ e->sp--; - if (e->sp->len && e->sp->data[0] != '0') { + if (e->sp->len && (e->sp->len !=1 || e->sp->data[0] != '0')) { if (code->loc_conf) { e->request->loc_conf = code->loc_conf; ngx_http_update_location_config(e->request); diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -313,25 +313,25 @@ static ngx_http_variable_t ngx_http_ups { ngx_string("upstream_addr"), NULL, ngx_http_upstream_addr_variable, 0, - NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, { ngx_string("upstream_status"), NULL, ngx_http_upstream_status_variable, 0, - NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, { ngx_string("upstream_response_time"), NULL, ngx_http_upstream_response_time_variable, 0, - NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, { ngx_string("upstream_response_length"), NULL, ngx_http_upstream_response_length_variable, 0, - NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, #if (NGX_HTTP_CACHE) { ngx_string("upstream_cache_status"), NULL, ngx_http_upstream_cache_status, 0, - NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 }, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, #endif diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -157,6 +157,7 @@ ngx_int_t ngx_set_file_time(u_char *name #define ngx_is_exec(sb) (((sb)->st_mode & S_IXUSR) == S_IXUSR) #define ngx_file_access(sb) ((sb)->st_mode & 0777) #define ngx_file_size(sb) (sb)->st_size +#define ngx_file_fs_size(sb) ((sb)->st_blocks * 512) #define ngx_file_mtime(sb) (sb)->st_mtime #define ngx_file_uniq(sb) (sb)->st_ino diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -88,7 +88,7 @@ typedef struct iocb ngx_aiocb_t; #endif -#define NGX_LISTEN_BACKLOG -1 +#define NGX_LISTEN_BACKLOG 511 #if defined TCP_DEFER_ACCEPT && !defined NGX_HAVE_DEFERRED_ACCEPT