nginx-0.3.27-RELEASE importrelease-0.3.27

    *) Change: the "variables_hash_max_size" and
       "variables_hash_bucket_size" directives.

    *) Feature: the $body_bytes_sent variable can be used not only in the
       "log_format" directive.

    *) Feature: the $ssl_protocol and $ssl_cipher variables.

    *) Feature: the cache line size detection for widespread CPUs at start
       time.

    *) Feature: now the "accept_mutex" directive is supported using
       fcntl(2) on platforms different from i386, amd64, sparc64, and ppc.

    *) Feature: the "lock_file" directive and the --with-lock-path=PATH
       autoconfiguration directive.

    *) Bugfix: if the HTTPS protocol was used in the "proxy_pass" directive
       then the requests with the body was not transferred.

1 files changed, 17 insertions, 0 deletions

diff --git a/auto/options b/auto/options
index 6b991a955..2f4be623c 100644
--- a/auto/options
+++ b/auto/options
@@ -9,6 +9,7 @@ NGX_SBIN_PATH=
 NGX_CONF_PATH=
 NGX_ERROR_LOG_PATH=
 NGX_PID_PATH=
+NGX_LOCK_PATH=
 NGX_USER=
 NGX_GROUP=
 
@@ -112,6 +113,7 @@ do
         --conf-path=*)                   NGX_CONF_PATH="$value"     ;;
         --error-log-path=*)              NGX_ERROR_LOG_PATH="$value";;
         --pid-path=*)                    NGX_PID_PATH="$value"      ;;
+        --lock-path=*)                   NGX_LOCK_PATH="$value"     ;;
         --user=*)                        NGX_USER="$value"          ;;
         --group=*)                       NGX_GROUP="$value"         ;;
 
@@ -212,6 +214,7 @@ cat << END
   --conf-path=PATH                   set path to the nginx.conf file
   --error-log-path=PATH              set path to the error log
   --pid-path=PATH                    set path to nginx.pid file
+  --lock-path=PATH                   set path to nginx.lock file
 
   --user=USER                        set non-privilege user
                                      for the worker processes
@@ -354,6 +357,20 @@ case ".$NGX_PID_PATH" in
 esac
 
 
+case ".$NGX_LOCK_PATH" in
+    ./*)
+    ;;
+
+    .)
+        NGX_LOCK_PATH=$NGX_PREFIX/logs/nginx.lock
+    ;;
+
+    *)
+        NGX_LOCK_PATH=$NGX_PREFIX/$NGX_LOCK_PATH
+    ;;
+esac
+
+
 case ".$NGX_ERROR_LOG_PATH" in
     ./*)
     ;;