merge changes between nginx-1.0.11 and nginx-1.0.12

http://rb.corp.taobao.com/r/23810/ git-svn-id: http://code.taobao.org/svn/tengine/trunk@28 8a6cbc4f-5610-49f6-9325-3f9afe71ff98
alibaba · Feb 17, 2012 · 7736248 · 7736248
1 parent a4a1038
commit 7736248
Show file tree

Hide file tree

Showing 324 changed files with 804 additions and 286 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4  1,59 @@
 
 Changes with nginx 1.0.12                                        06 Feb 2012
 
     *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the
        "ssl_protocols" directive.
 
     *) Feature: the "if" SSI command supports captures in regular
        expressions.
 
     *) Bugfix: the "if" SSI command did not work inside the "block" command.
 
     *) Bugfix: in AIO error handling on FreeBSD.
 
     *) Bugfix: in the OpenSSL library initialization.
 
     *) Bugfix: the "worker_cpu_affinity" directive might not work.
 
     *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level"
        directives might not work.
 
     *) Bugfix: the "read_ahead" directive might not work combined with
        "try_files" and "open_file_cache".
 
     *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter
        did not return answer from cache if there were no live upstreams.
 
     *) Bugfix: a segmentation fault might occur in a worker process if small
        time was used in the "inactive" parameter of the "proxy_cache_path"
        directive.
 
     *) Bugfix: responses from cache might hang.
 
     *) Bugfix: in error handling while connecting to a backend.
        Thanks to Piotr Sikora.
 
     *) Bugfix: in the "epoll" event method.
        Thanks to Yichun Zhang.
 
     *) Bugfix: the $sent_http_cache_control variable might contain a wrong
        value if the "expires" directive was used.
        Thanks to Yichun Zhang.
 
     *) Bugfix: the "limit_rate" directive did not allow to use full
        throughput, even if limit value was very high.
 
     *) Bugfix: the "sendfile_max_chunk" directive did not work, if the
        "limit_rate" directive was used.
 
     *) Bugfix: nginx could not be built on Solaris; the bug had appeared in
        1.0.11.
 
     *) Bugfix: in the ngx_http_scgi_module.
 
     *) Bugfix: in the ngx_http_mp4_module.
 
 
 Changes with nginx 1.0.11                                        15 Dec 2011
 
     *) Change: now double quotes are encoded in an "echo" SSI-command
@@ -4447,8  4502,8 @@ Changes with nginx 0.3.6                                         24 Oct 2005
     *) Bugfix: if at least in one server was no the "listen" directive, then
        nginx did not listen on the 80 port; the bug had appeared in 0.3.3.
 
-    *) Bugfix: if the URI part is omitted in "proxy_pass" directive, the the
-       80 port was always used.
     *) Bugfix: if the URI part is omitted in "proxy_pass" directive, the 80
        port was always used.
 
 
 Changes with nginx 0.3.5                                         21 Oct 2005
@@ -4693,7  4748,7 @@ Changes with nginx 0.1.43                                        30 Aug 2005
     *) Bugfix: the segmentation fault occurred or the worker process may got
        caught in an endless loop if the proxied or FastCGI server sent the
        "Cache-Control" header line and the "expires" directive was used; in
-       the proxied mode the the bug had appeared in 0.1.29.
        the proxied mode the bug had appeared in 0.1.29.
 
 
 Changes with nginx 0.1.42                                        23 Aug 2005
@@ -4768,8  4823,8 @@ Changes with nginx 0.1.39                                        14 Jul 2005
 
 Changes with nginx 0.1.38                                        08 Jul 2005
 
-    *) Feature: the "limit_rate" directive is supported in in proxy and
-       FastCGI mode.
     *) Feature: the "limit_rate" directive is supported in proxy and FastCGI
        mode.
 
     *) Feature: the "X-Accel-Limit-Rate" response header line is supported
        in proxy and FastCGI mode.
@@ -4921,8  4976,7 @@ Changes with nginx 0.1.30                                        14 May 2005
 
     *) Bugfix: if the length of the response part received at once from
        proxied or FastCGI server was equal to 500, then nginx returns the
-       500 response code; in proxy mode the the bug had appeared in 0.1.29
-       only.
        500 response code; in proxy mode the bug had appeared in 0.1.29 only.
 
     *) Bugfix: nginx did not consider the directives with 8 or 9 parameters
        as invalid.
@@ -5165,7  5219,7 @@ Changes with nginx 0.1.19                                        16 Feb 2005
 
     *) Bugfix: nginx could not be built on NetBSD 2.0.
 
-    *) Bugfix: the timeout may occur while reading of the the client request
     *) Bugfix: the timeout may occur while reading of the client request
        body via SSL connections.
 
 

diff --git a/CHANGES.ru b/CHANGES.ru
@@ -1,4  1,59 @@
 
 Изменения в nginx 1.0.12                                          06.02.2012
 
     *) Добавление: параметры TLSv1.1 и TLSv1.2 в директиве ssl_protocols.
 
     *) Добавление: SSI команда if поддерживает выделения в регулярных
        выражениях.
 
     *) Исправление: SSI команда if не работала внутри команды block.
 
     *) Исправление: в обработке ошибок при использовании AIO на FreeBSD.
 
     *) Исправление: в инициализации библиотеки OpenSSL.
 
     *) Исправление: директива worker_cpu_affinity могла не работать.
 
     *) Исправление: директивы limit_conn_log_level и limit_req_log_level
        могли не работать.
 
     *) Исправление: директива read_ahead могла не работать при использовании
        совместно с try_files и open_file_cache.
 
     *) Исправление: директива proxy_cache_use_stale с параметром error не
        возвращала ответ из кэша, если все бэкенды были признаны
        неработающими.
 
     *) Исправление: если в параметре inactive директивы proxy_cache_path
        было указано малое время, в рабочем процессе мог произойти
        segmentation fault.
 
     *) Исправление: ответы из кэша могли зависать.
 
     *) Исправление: в обработке ошибок при соединении с бэкендом.
        Спасибо Piotr Sikora.
 
     *) Исправление: в методе epoll.
        Спасибо Yichun Zhang.
 
     *) Исправление: переменная $sent_http_cache_control могла содержать
        неверное значение при использовании директивы expires.
        Спасибо Yichun Zhang.
 
     *) Исправление: директива limit_rate не позволяла передавать на полной
        скорости, даже если был указан очень большой лимит.
 
     *) Исправление: директива sendfile_max_chunk не работала, если
        использовалась директива limit_rate.
 
     *) Исправление: nginx не собирался на Solaris; ошибка появилась в
        1.0.11.
 
     *) Исправление: в модуле ngx_http_scgi_module.
 
     *) Исправление: в модуле ngx_http_mp4_module.
 
 
 Изменения в nginx 1.0.11                                          15.12.2011
 
     *) Изменение: теперь двойные кавычки экранируется при выводе

diff --git a/LICENSE b/LICENSE
@@ -1,5  1,6 @@
 /* 
- * Copyright (C) 2002-2011 Igor Sysoev
  * Copyright (C) 2002-2012 Igor Sysoev
  * Copyright (C) 2011,2012 Nginx, Inc.
  * Copyright (C) 2010-2012 Alibaba Group Holding Limited
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/auto/cc/acc b/auto/cc/acc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # aCC: HP ANSI C   B3910B A.03.55.02

diff --git a/auto/cc/bcc b/auto/cc/bcc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # Borland C   5.5

diff --git a/auto/cc/ccc b/auto/cc/ccc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # Compaq C V6.5-207

diff --git a/auto/cc/conf b/auto/cc/conf
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 LINK="\$(CC)"

diff --git a/auto/cc/gcc b/auto/cc/gcc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # gcc 2.7.2.3, 2.8.1, 2.95.4, egcs-1.1.2

diff --git a/auto/cc/icc b/auto/cc/icc
@@ -1,8  1,9 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
-# Intel C   compiler 7.1, 8.0, 8.1, 9.0
 # Intel C   compiler 7.1, 8.0, 8.1, 9.0, 11.1
 
 NGX_ICC_VER=`$CC -V 2>&1 | grep 'Version' 2>&1 \
                          | sed -e 's/^.* Version \([^ ]*\) *Build.*$/\1/'`
@@ -15,32  16,7 @@ have=NGX_COMPILER value="\"Intel C Compiler $NGX_ICC_VER\"" . auto/define
 # optimizations
 
 CFLAGS="$CFLAGS -O"
-# inline the functions declared with __inline
-#CFLAGS="$CFLAGS -Ob1"
-# inline any function, at the compiler's discretion
-CFLAGS="$CFLAGS -Ob2"
 
-# multi-file IP optimizations
-case "$NGX_ICC_VER" in
-    9.*)
-        IPO="-ipo"
-    ;;
-
-    # 8.1.38 under FreeBSD can not link -ipo
-    8.1)
-        IPO="-ip"
-    ;;
-
-    *)
-        IPO="-ipo -ipo_obj"
-    ;;
-esac
-
-# single-file IP optimizations
-#IPO="-ip"
-
-CFLAGS="$CFLAGS $IPO"
-CORE_LINK="$CORE_LINK $IPO"
 CORE_LINK="$CORE_LINK -opt_report_file=$NGX_OBJS/opt_report_file"
 
 
@@ -64,15  40,15 @@ esac
 CFLAGS="$CFLAGS $CPU_OPT"
 
 if [ ".$PCRE_OPT" = "." ]; then
-    PCRE_OPT="-O $IPO $CPU_OPT"
     PCRE_OPT="-O $CPU_OPT"
 fi
 
 if [ ".$MD5_OPT" = "." ]; then
-    MD5_OPT="-O $IPO $CPU_OPT"
     MD5_OPT="-O $CPU_OPT"
 fi
 
 if [ ".$ZLIB_OPT" = "." ]; then
-    ZLIB_OPT="-O $IPO $CPU_OPT"
     ZLIB_OPT="-O $CPU_OPT"
 fi
 
 

diff --git a/auto/cc/msvc b/auto/cc/msvc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # MSVC 6.0 SP2

diff --git a/auto/cc/name b/auto/cc/name
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 if [ "$NGX_PLATFORM" != win32 ]; then

diff --git a/auto/cc/owc b/auto/cc/owc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # Open Watcom C 1.0, 1.2, 1.3

diff --git a/auto/cc/sunc b/auto/cc/sunc
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 # Sun C 5.7 Patch 117837-04 2005/05/11    Sun Studio 10

diff --git a/auto/define b/auto/define
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 cat << END >> $NGX_AUTO_CONFIG_H

diff --git a/auto/endianess b/auto/endianess
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 echo $ngx_n "checking for system endianess ...$ngx_c"

diff --git a/auto/feature b/auto/feature
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 echo $ngx_n "checking for $ngx_feature ...$ngx_c"

diff --git a/auto/have b/auto/have
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 cat << END >> $NGX_AUTO_CONFIG_H

diff --git a/auto/have_headers b/auto/have_headers
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 cat << END >> $NGX_AUTO_HEADERS_H

diff --git a/auto/headers b/auto/headers
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 ngx_include="unistd.h";      . auto/include

diff --git a/auto/include b/auto/include
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 echo $ngx_n "checking for $ngx_include ...$ngx_c"

diff --git a/auto/init b/auto/init
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 NGX_MAKEFILE=$NGX_OBJS/Makefile

diff --git a/auto/install b/auto/install
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 if [ $USE_PERL = YES ]; then
@@ -72,7  73,7 @@ case ".$NGX_HTTP_LOG_PATH" in
 esac
 
 
-if test -e man/nginx.8 ; then
 if test -f man/nginx.8 ; then
     NGX_MAN=man/nginx.8
 else
     NGX_MAN=docs/man/nginx.8

diff --git a/auto/lib/conf b/auto/lib/conf
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then

diff --git a/auto/lib/geoip/conf b/auto/lib/geoip/conf
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
     ngx_feature="GeoIP library"

diff --git a/auto/lib/google-perftools/conf b/auto/lib/google-perftools/conf
@@ -1,5  1,6 @@
 
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.
 
 
     ngx_feature="Google perftools"