nginx-0.3.12-RELEASE importrelease-0.3.12

    *) Security: if nginx was built with the ngx_http_realip_module and the
       "satisfy_any on" directive was used, then access and authorization
       directives did not work. The ngx_http_realip_module was not built
       and is not built by default.

    *) Change: the "$time_gmt" variable name was changed to "$time_local".

    *) Change: the "proxy_header_buffer_size" and
       "fastcgi_header_buffer_size" directives was renamed to the
       "proxy_buffer_size" and "fastcgi_buffer_size" directives.

    *) Feature: the ngx_http_memcached_module.

    *) Feature: the "proxy_buffering" directive.

    *) Bugfix: the changes in accept mutex handling when the "rtsig" method
       was used; the bug had appeared in 0.3.0.

    *) Bugfix: if the client sent the "Transfer-Encoding: chunked" header
       line, then nginx returns the 411 error.

    *) Bugfix: if the "auth_basic" directive was inherited from the http
       level, then the realm in the "WWW-Authenticate" header line was
       without the "Basic realm" text.

    *) Bugfix: if the "combined" format was explicitly specified in the
       "access_log" directive, then the empty lines was written to the log;
       the bug had appeared in 0.3.8.

    *) Bugfix: nginx did not run on the sparc platform under any OS except
       Solaris.

    *) Bugfix: now it is not necessary to place space between the quoted
       string and closing bracket in the "if" directive.

5 files changed, 30 insertions, 4 deletions

diff --git a/auto/cc/gcc b/auto/cc/gcc
index 6f1a953a6..05970722c 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -34,9 +34,9 @@ if [ $ngx_found = yes ]; then
 fi
 
 
-case "$NGX_PLATFORM" in
+case "$NGX_MACHINE" in
 
-    *:sun4u)
+    sun4u | sparc )
         # "-mcpu=v9" enables the "casa" assembler instruction
         CFLAGS="$CFLAGS -mcpu=v9"
     ;;
@@ -80,6 +80,13 @@ case $CPU in
         CPU_OPT="-march=opteron"
     ;;
 
+    sparc32)
+        # build 32-bit UltraSparc binary
+        CPU_OPT="-m32"
+        CORE_LINK="$CORE_LINK -m32"
+        CC_AUX_FLAGS="$CC_AUX_FLAGS -m32"
+    ;;
+
     sparc64)
         # build 64-bit UltraSparc binary
         CPU_OPT="-m64"
diff --git a/auto/modules b/auto/modules
index c94b6e5ba..5940b28d4 100644
--- a/auto/modules
+++ b/auto/modules
@@ -194,6 +194,11 @@ if [ $HTTP_FASTCGI = YES ]; then
     HTTP_SRCS="$HTTP_SRCS $HTTP_FASTCGI_SRCS"
 fi
 
+if [ $HTTP_MEMCACHED = YES ]; then
+    HTTP_MODULES="$HTTP_MODULES $HTTP_MEMCACHED_MODULE"
+    HTTP_SRCS="$HTTP_SRCS $HTTP_MEMCACHED_SRCS"
+fi
+
 if [ $HTTP_EMPTY_GIF = YES ]; then
     HTTP_MODULES="$HTTP_MODULES $HTTP_EMPTY_GIF_MODULE"
     HTTP_SRCS="$HTTP_SRCS $HTTP_EMPTY_GIF_SRCS"
diff --git a/auto/options b/auto/options
index 2dccb7373..6c249b119 100644
--- a/auto/options
+++ b/auto/options
@@ -61,6 +61,7 @@ HTTP_REFERER=YES
 HTTP_REWRITE=YES
 HTTP_PROXY=YES
 HTTP_FASTCGI=YES
+HTTP_MEMCACHED=YES
 HTTP_EMPTY_GIF=YES
 
 # STUB
@@ -138,11 +139,12 @@ do
         --without-http_autoindex_module) HTTP_AUTOINDEX=NO          ;;
         --without-http_status_module)    HTTP_STATUS=NO             ;;
         --without-http_geo_module)       HTTP_GEO=NO                ;;
-        --without-http_referer)          HTTP_REFERER=NO            ;;
+        --without-http_referer_module)   HTTP_REFERER=NO            ;;
         --without-http_rewrite_module)   HTTP_REWRITE=NO            ;;
         --without-http_proxy_module)     HTTP_PROXY=NO              ;;
         --without-http_fastcgi_module)   HTTP_FASTCGI=NO            ;;
-        --without-http_epmty_gif_module) HTTP_EMPTY_GIF=NO          ;;
+        --without-http_memcached_module) HTTP_MEMCACHED=NO          ;;
+        --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO          ;;
 
         # STUB
         --with-http_stub_status_module)  HTTP_STUB_STATUS=YES       ;;
@@ -213,6 +215,7 @@ cat << END
   --without-poll_module              disable poll module
 
   --with-http_ssl_module             enable ngx_http_ssl_module
+  --with-http_realip_module          enable ngx_http_realip_module
   --without-http_charset_module      disable ngx_http_charset_module
   --without-http_gzip_module         disable ngx_http_gzip_module
   --without-http_ssi_module          disable ngx_http_ssi_module
@@ -221,9 +224,12 @@ cat << END
   --without-http_auth_basic_module   disable ngx_http_auth_basic_module
   --without-http_autoindex_module    disable ngx_http_autoindex_module
   --without-http_geo_module          disable ngx_http_geo_module
+  --without-http_referer_module      disable ngx_http_referer_module
   --without-http_rewrite_module      disable ngx_http_rewrite_module
   --without-http_proxy_module        disable ngx_http_proxy_module
   --without-http_fastcgi_module      disable ngx_http_fastcgi_module
+  --without-http_memcached_module    disable ngx_http_memcached_module
+  --without-http_empty_gif_module    disable ngx_http_empty_gif_module
 
   --http-log-path=PATH               set path to the http access log
   --http-client-body-temp-path=PATH  set path to the http client request body
diff --git a/auto/os/conf b/auto/os/conf
index 56bdd2219..4ad72d8f1 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -63,4 +63,8 @@ case "$NGX_MACHINE" in
         have=NGX_HAVE_NONALIGNED . auto/have
     ;;
 
+    sun4u | ia64 )
+        have=NGX_ALIGNMENT value=16 . auto/define
+    ;;
+
 esac
diff --git a/auto/sources b/auto/sources
index c4316d7cd..0b9245d7d 100644
--- a/auto/sources
+++ b/auto/sources
@@ -355,6 +355,10 @@ HTTP_FASTCGI_MODULE=ngx_http_fastcgi_module
 HTTP_FASTCGI_SRCS=src/http/modules/ngx_http_fastcgi_module.c
 
 
+HTTP_MEMCACHED_MODULE=ngx_http_memcached_module
+HTTP_MEMCACHED_SRCS=src/http/modules/ngx_http_memcached_module.c
+
+
 HTTP_EMPTY_GIF_MODULE=ngx_http_empty_gif_module
 HTTP_EMPTY_GIF_SRCS=src/http/modules/ngx_http_empty_gif_module.c