nginx-0.3.28-RELEASE importrelease-0.3.28

    *) Feature: the "restrict_host_names" directive was canceled.

    *) Feature: the --with-cpu-opt=ppc64 configuration parameter.

    *) Bugfix: on some condition the proxied connection with a client was
       terminated prematurely.
       Thanks to Vladimir Shutoff.

    *) Bugfix: the "X-Accel-Limit-Rate" header line was not taken into
       account if the request was redirected using the "X-Accel-Redirect"
       header line.

    *) Bugfix: the "post_action" directive ran only after a successful
       completion of a request.

    *) Bugfix: the proxied response body generated by the "post_action"
       directive was transferred to a client.

2 files changed, 12 insertions, 1 deletions

diff --git a/auto/cc/gcc b/auto/cc/gcc
index 21a73406e..96ea865b8 100644
--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@@ -101,6 +101,16 @@ case $CPU in
         NGX_CPU_CACHE_LINE=64
     ;;
 
+    ppc64)
+        # build 64-bit PowerPC binary
+        CPU_OPT="-m64"
+        CPU_OPT="$CPU_OPT -falign-functions=32 -falign-labels=32"
+        CPU_OPT="$CPU_OPT -falign-loops=32 -falign-jumps=32"
+        CORE_LINK="$CORE_LINK -m64"
+        CC_AUX_FLAGS="$CC_AUX_FLAGS -m64"
+        NGX_CPU_CACHE_LINE=128
+    ;;
+
 esac
 
 
diff --git a/auto/options b/auto/options
index 2f4be623c..4ff11000c 100644
--- a/auto/options
+++ b/auto/options
@@ -267,7 +267,8 @@ cat << END
   --with-cc-opt=OPTIONS              set additional options for C compiler
   --with-ld-opt=OPTIONS              set additional options for linker
   --with-cpu-opt=CPU                 build for specified CPU, the valid values:
-                                     pentium, pentiumpro, pentium4, sparc64
+                                     pentium, pentiumpro, pentium3, pentium4,
+                                     athlon, opteron, sparc32, sparc64, ppc64
 
   --without-pcre                     disable PCRE libarary usage
   --with-pcre=DIR                    set path to PCRE library sources