nginx 0.5.33

CHANGES

@@ -1,4 +1,39 @@
 
+Changes with nginx 0.5.33                                        07 Nov 2007
+
+    *) Change: now by default the "echo" SSI command uses entity encoding.
+
+    *) Feature: the "encoding" parameter in the "echo" SSI command.
+
+    *) Change: mail proxy was split on three modules: pop3, imap and smtp.
+
+    *) Feature: the --without-mail_pop3_module, --without-mail_imap_module, 
+       and --without-mail_smtp_module configuration parameters.
+
+    *) Feature: the "smtp_greeting_delay" and "smtp_client_buffer" 
+       directives of the ngx_mail_smtp_module.
+
+    *) Feature: the "server_name" and "valid_referers" directives support 
+       regular expressions.
+
+    *) Feature: the "server_name", "map", and "valid_referers" directives 
+       support the "www.example.*" wildcards.
+
+    *) Bugfix: sub_filter did not work with empty substitution.
+
+    *) Bugfix: in sub_filter parsing.
+
+    *) Bugfix: a worker process may got caught in an endless loop, if the 
+       memcached was used.
+
+    *) Bugfix: nginx supported low case only "close" and "keep-alive" 
+       values in the "Connection" request header line; bug appeared in 
+       0.5.32.
+
+    *) Bugfix: nginx could not start on Solaris if the shared PCRE library 
+       located in non-standard place was used.
+
+
 Changes with nginx 0.5.32                                        24 Sep 2007
 
     *) Change: now nginx tries to set the "worker_priority", 
@@ -285,7 +320,7 @@ Changes with nginx 0.5.16                                        26 Mar 2007
        trailing ";"; bug appeared in 0.3.50.
 
     *) Bugfix: the "[alert] zero size buf" error when FastCGI server was 
-       used and an request body written in a temporary file was multiple of 
+       used and a request body written in a temporary file was multiple of 
        32K.
 
     *) Bugfix: nginx could not be built on Solaris without the --with-debug 
@@ -589,7 +624,7 @@ Changes with nginx 0.4.14                                        27 Nov 2006
     *) Bugfix: ngx_http_perl_module did not work if perl was called 
        recursively.
 
-    *) Bugfix: nginx ignored a host name in an request line.
+    *) Bugfix: nginx ignored a host name in a request line.
 
     *) Bugfix: a worker process may got caught in an endless loop, if a 
        FastCGI server sent too many data to the stderr.
@@ -612,7 +647,7 @@ Changes with nginx 0.4.13                                        15 Nov 2006
     *) Feature: the "limit_except" directive supports all WebDAV methods.
 
     *) Bugfix: if the "add_before_body" directive was used without the 
-       "add_after_body" directive, then an response did not transferred 
+       "add_after_body" directive, then a response did not transferred 
        complete.
 
     *) Bugfix: a large request body did not receive if the epoll method and 
@@ -681,8 +716,8 @@ Changes with nginx 0.4.9                                         13 Oct 2006
 Changes with nginx 0.4.8                                         11 Oct 2006
 
     *) Bugfix: if an "include" SSI command were before another "include" 
-       SSI command with an "wait" parameter, then the "wait" parameter 
-       might not work.
+       SSI command with a "wait" parameter, then the "wait" parameter might 
+       not work.
 
     *) Bugfix: the ngx_http_flv_module added the FLV header to the full 
        responses.
@@ -699,8 +734,8 @@ Changes with nginx 0.4.7                                         10 Oct 2006
        variables.
 
     *) Bugfix: if an "include" SSI command were before another "include" 
-       SSI command with an "wait" parameter, then the "wait" parameter 
-       might not work.
+       SSI command with a "wait" parameter, then the "wait" parameter might 
+       not work.
 
     *) Bugfix: if the "proxy_buffering off" directive was used or while 
        working with memcached the connections might not be closed on 
@@ -759,10 +794,10 @@ Changes with nginx 0.4.3                                         26 Sep 2006
     *) Feature: the ngx_http_browser_module.
 
     *) Bugfix: a segmentation fault may occur while redirecting the 400 
-       error to the proxied server using an "proxy_pass" directive.
+       error to the proxied server using a "proxy_pass" directive.
 
     *) Bugfix: a segmentation fault occurred if an unix domain socket was 
-       used in an "proxy_pass" directive; bug appeared in 0.3.47.
+       used in a "proxy_pass" directive; bug appeared in 0.3.47.
 
     *) Bugfix: SSI did work with memcached and nonbuffered responses.
 
@@ -877,7 +912,7 @@ Changes with nginx 0.3.56                                        04 Aug 2006
     *) Feature: the "if" directive supports the "-d", "!-d", "-e", "!-e", 
        "-x", and "!-x" operators.
 
-    *) Bugfix: a segmentation fault occurred if an request returned an 
+    *) Bugfix: a segmentation fault occurred if a request returned a 
        redirect and some sent to client header lines were logged in the 
        access log.
 

CHANGES.ru

@@ -1,4 +1,41 @@
 
+Изменения в nginx 0.5.33                                          07.11.2007
+
+    *) Изменение: теперь по умолчанию команда SSI echo использует 
+       кодирование entity.
+
+    *) Добавление: параметр encoding в команде SSI echo.
+
+    *) Изменение: почтовый прокси-сервер разделён на три модуля: pop3, imap 
+       и smtp.
+
+    *) Добавление: параметры конфигурации --without-mail_pop3_module, 
+       --without-mail_imap_module и --without-mail_smtp_module.
+
+    *) Добавление: директивы smtp_greeting_delay и smtp_client_buffer 
+       модуля ngx_mail_smtp_module.
+
+    *) Добавление: директивы server_name и valid_referers поддерживают 
+       регулярные выражения.
+
+    *) Добавление: директивы "server_name", "map", and "valid_referers" 
+       поддерживают маски вида "www.example.*".
+
+    *) Исправление: sub_filter не работал с пустой строкой замены.
+
+    *) Исправление: в парсинге sub_filter.
+
+    *) Исправление: рабочий процесс мог зациклиться при использовании 
+       memcached.
+
+    *) Исправление: nginx распознавал параметры "close" и "keep-alive" в 
+       строке "Connection" в заголовке запроса только, если они были в 
+       нижнем регистре; ошибка появилась в 0.5.32.
+
+    *) Исправление: при использовании разделяемой библиотеки PCRE, 
+       расположенной в нестандартном месте, nginx не запускался на Solaris.
+
+
 Изменения в nginx 0.5.32                                          24.09.2007
 
     *) Изменение: теперь nginx пытается установить директивы 

auto/lib/pcre/conf

@@ -77,7 +77,6 @@ if [ $PCRE != NONE ]; then
             CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
             LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
             CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
-            #CORE_LIBS="$CORE_LIBS -L $PCRE/.libs -lpcre"
         ;;
 
     esac
@@ -111,7 +110,13 @@ else
             ngx_feature_run=no
             ngx_feature_incs="#include <pcre.h>"
             ngx_feature_path="/usr/local/include"
-            ngx_feature_libs="-L /usr/local/lib -lpcre"
+
+            if [ $NGX_RPATH = YES ]; then
+                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lpcre"
+            else
+                ngx_feature_libs="-L/usr/local/lib -lpcre"
+            fi
+
             ngx_feature_test="pcre *re;
                               re = pcre_compile(NULL, 0, NULL, 0, NULL)"
             . auto/feature
@@ -160,7 +165,13 @@ else
                 ngx_feature_run=no
                 ngx_feature_incs="#include <pcre.h>"
                 ngx_feature_path="/usr/pkg/include"
-                ngx_feature_libs="-L /usr/pkg/lib -lpcre"
+
+                if [ $NGX_RPATH = YES ]; then
+                    ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lpcre"
+                else
+                    ngx_feature_libs="-L/usr/pkg/lib -lpcre"
+                fi
+
                 ngx_feature_test="pcre *re;
                                   re = pcre_compile(NULL, 0, NULL, 0, NULL)"
                 . auto/feature
@@ -185,7 +196,13 @@ else
                 ngx_feature_run=no
                 ngx_feature_incs="#include <pcre.h>"
                 ngx_feature_path="/opt/local/include"
-                ngx_feature_libs="-L/opt/local/lib -lpcre"
+
+                if [ $NGX_RPATH = YES ]; then
+                    ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lpcre"
+                else
+                    ngx_feature_libs="-L/opt/local/lib -lpcre"
+                fi
+
                 ngx_feature_test="pcre *re;
                                   re = pcre_compile(NULL, 0, NULL, 0, NULL)"
                 . auto/feature

auto/modules

@@ -308,8 +308,6 @@ fi
 
 
 if [ $MAIL_SSL = YES ]; then
-    MAIL_DEPS="$MAIL_DEPS $MAIL_SSL_DEPS"
-    MAIL_SRCS="$MAIL_SRCS $MAIL_SSL_SRCS"
     have=NGX_MAIL_SSL . auto/have
     USE_OPENSSL=YES
 fi
@@ -341,6 +339,26 @@ if [ $MAIL = YES ]; then
 
     if [ $MAIL_SSL = YES ]; then
         modules="$modules $MAIL_SSL_MODULE"
+        MAIL_DEPS="$MAIL_DEPS $MAIL_SSL_DEPS"
+        MAIL_SRCS="$MAIL_SRCS $MAIL_SSL_SRCS"
+    fi
+
+    if [ $MAIL_POP3 = YES ]; then
+        modules="$modules $MAIL_POP3_MODULE"
+        MAIL_DEPS="$MAIL_DEPS $MAIL_POP3_DEPS"
+        MAIL_SRCS="$MAIL_SRCS $MAIL_POP3_SRCS"
+    fi
+
+    if [ $MAIL_IMAP = YES ]; then
+        modules="$modules $MAIL_IMAP_MODULE"
+        MAIL_DEPS="$MAIL_DEPS $MAIL_IMAP_DEPS"
+        MAIL_SRCS="$MAIL_SRCS $MAIL_IMAP_SRCS"
+    fi
+
+    if [ $MAIL_SMTP = YES ]; then
+        modules="$modules $MAIL_SMTP_MODULE"
+        MAIL_DEPS="$MAIL_DEPS $MAIL_SMTP_DEPS"
+        MAIL_SRCS="$MAIL_SRCS $MAIL_SMTP_SRCS"
     fi
 
     modules="$modules $MAIL_AUTH_HTTP_MODULE"

auto/options

@@ -22,6 +22,8 @@ NGX_CC_OPT=
 NGX_LD_OPT=
 CPU=NO
 
+NGX_RPATH=NO
+
 NGX_TEST_BUILD_DEVPOLL=NO
 NGX_TEST_BUILD_EVENTPORT=NO
 NGX_TEST_BUILD_EPOLL=NO
@@ -80,6 +82,9 @@ HTTP_STUB_STATUS=NO
 
 MAIL=NO
 MAIL_SSL=NO
+MAIL_POP3=YES
+MAIL_IMAP=YES
+MAIL_SMTP=YES
 
 NGX_ADDONS=
 
@@ -189,6 +194,9 @@ do
         # STUB
         --with-imap)                     MAIL=YES                   ;;
         --with-imap_ssl_module)          MAIL_SSL=YES               ;;
+        --without-mail_pop3_module)      MAIL_POP3=NO               ;;
+        --without-mail_imap_module)      MAIL_IMAP=NO               ;;
+        --without-mail_smtp_module)      MAIL_SMTP=NO               ;;
 
         --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
 
@@ -299,8 +307,11 @@ cat << END
 
   --without-http                     disable HTTP server
 
-  --with-mail                        enable IMAP4/POP3/SMTP proxy module
+  --with-mail                        enable POP3/IMAP4/SMTP proxy module
   --with-mail_ssl_module             enable ngx_mail_ssl_module
+  --without-mail_pop3_module         disable ngx_mail_pop3_module
+  --without-mail_imap_module         disable ngx_mail_imap_module
+  --without-mail_smtp_module         disable ngx_mail_smtp_module
 
   --add-module=PATH                  enable an external module
 

auto/os/solaris

@@ -9,6 +9,8 @@ CORE_DEPS="$UNIX_DEPS $SOLARIS_DEPS"
 CORE_SRCS="$UNIX_SRCS $SOLARIS_SRCS "
 CORE_LIBS="$CORE_LIBS -lsocket -lnsl -lrt"
 
+NGX_RPATH=YES
+
 # Solaris's make does not support a blank line between target and rules
 ngx_spacer=
 

auto/sources

@@ -423,6 +423,21 @@ MAIL_SRCS="src/mail/ngx_mail.c \
            src/mail/ngx_mail_handler.c \
            src/mail/ngx_mail_parse.c"
 
+MAIL_POP3_MODULE="ngx_mail_pop3_module"
+MAIL_POP3_DEPS="src/mail/ngx_mail_pop3_module.h"
+MAIL_POP3_SRCS="src/mail/ngx_mail_pop3_module.c \
+                src/mail/ngx_mail_pop3_handler.c"
+
+MAIL_IMAP_MODULE="ngx_mail_imap_module"
+MAIL_IMAP_DEPS="src/mail/ngx_mail_imap_module.h"
+MAIL_IMAP_SRCS="src/mail/ngx_mail_imap_module.c \
+                src/mail/ngx_mail_imap_handler.c"
+
+MAIL_SMTP_MODULE="ngx_mail_smtp_module"
+MAIL_SMTP_DEPS="src/mail/ngx_mail_smtp_module.h"
+MAIL_SMTP_SRCS="src/mail/ngx_mail_smtp_module.c \
+                src/mail/ngx_mail_smtp_handler.c"
+
 MAIL_SSL_MODULE="ngx_mail_ssl_module"
 MAIL_SSL_DEPS="src/mail/ngx_mail_ssl_module.h"
 MAIL_SSL_SRCS="src/mail/ngx_mail_ssl_module.c"

auto/types/uintptr_t

@@ -36,5 +36,6 @@ if [ $found = no ]; then
     found="uint`expr 8 \* $ngx_ptr_size`_t"
     echo ", $found used"
 
-    echo "typedef $found  uintptr_t;"   >> $NGX_AUTO_CONFIG_H
+    echo "typedef $found  uintptr_t;"                   >> $NGX_AUTO_CONFIG_H
+    echo "typedef $found  intptr_t;" | sed -e 's/u//g'  >> $NGX_AUTO_CONFIG_H
 fi

src/core/nginx.h

@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VERSION      "0.5.32"
+#define NGINX_VERSION      "0.5.33"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"

src/core/ngx_config.h

@@ -70,31 +70,20 @@
 
 #endif
 
+typedef intptr_t        ngx_int_t;
+typedef uintptr_t       ngx_uint_t;
+typedef intptr_t        ngx_flag_t;
 
 
-/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */
-#define NGX_INVALID_ARRAY_INDEX 0x80000000
-
-
-#if 1
-/* STUB: autoconf */
-typedef int             ngx_int_t;
-typedef u_int           ngx_uint_t;
-typedef int             ngx_flag_t;
-#define NGX_INT_T_LEN   sizeof("-2147483648") - 1
+#define NGX_INT32_LEN   sizeof("-2147483648") - 1
+#define NGX_INT64_LEN   sizeof("-9223372036854775808") - 1
 
+#if (NGX_PTR_SIZE == 4)
+#define NGX_INT_T_LEN   NGX_INT32_LEN
 #else
-
-typedef long            ngx_int_t;
-typedef u_long          ngx_uint_t;
-typedef long            ngx_flag_t;
-#define NGX_INT_T_LEN   sizeof("-9223372036854775808") - 1
-
+#define NGX_INT_T_LEN   NGX_INT64_LEN
 #endif
 
-#define NGX_INT32_LEN   sizeof("-2147483648") - 1
-#define NGX_INT64_LEN   sizeof("-9223372036854775808") - 1
-
 
 #ifndef NGX_ALIGNMENT
 #define NGX_ALIGNMENT   sizeof(unsigned long)    /* platform word */
@@ -108,6 +97,10 @@ typedef long            ngx_flag_t;
 #define ngx_abort       abort
 
 
+/* TODO: platform specific: array[NGX_INVALID_ARRAY_INDEX] must cause SIGSEGV */
+#define NGX_INVALID_ARRAY_INDEX 0x80000000
+
+
 /* TODO: auto_conf: ngx_inline   inline __inline __inline__ */
 #ifndef ngx_inline
 #define ngx_inline      inline