diff options
Diffstat (limited to '')
| -rwxr-xr-x | auto/configure | 1 | ||||
| -rw-r--r-- | auto/options | 17 | ||||
| -rw-r--r-- | auto/sources | 3 |
3 files changed, 21 insertions, 0 deletions
diff --git a/auto/configure b/auto/configure index 89390ea69..307f3faf6 100755 --- a/auto/configure +++ b/auto/configure @@ -65,6 +65,7 @@ have=NGX_PREFIX value="\"$NGX_PREFIX/\"" . auto/define have=NGX_SBIN_PATH value="\"$NGX_SBIN_PATH\"" . auto/define have=NGX_CONF_PATH value="\"$NGX_CONF_PATH\"" . auto/define have=NGX_PID_PATH value="\"$NGX_PID_PATH\"" . auto/define +have=NGX_LOCK_PATH value="\"$NGX_LOCK_PATH\"" . auto/define if test -n "$NGX_ERROR_LOG_PATH"; then have=NGX_ERROR_LOG_PATH value="\"$NGX_ERROR_LOG_PATH\"" . auto/define fi 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 ./*) ;; diff --git a/auto/sources b/auto/sources index 5dac1995f..20866f699 100644 --- a/auto/sources +++ b/auto/sources @@ -23,6 +23,7 @@ CORE_DEPS="src/core/nginx.h \ src/core/ngx_rbtree.h \ src/core/ngx_radix_tree.h \ src/core/ngx_times.h \ + src/core/ngx_shmtx.h \ src/core/ngx_connection.h \ src/core/ngx_cycle.h \ src/core/ngx_conf_file.h \ @@ -44,9 +45,11 @@ CORE_SRCS="src/core/nginx.c \ src/core/ngx_rbtree.c \ src/core/ngx_radix_tree.c \ src/core/ngx_times.c \ + src/core/ngx_shmtx.c \ src/core/ngx_connection.c \ src/core/ngx_cycle.c \ src/core/ngx_spinlock.c \ + src/core/ngx_cpuinfo.c \ src/core/ngx_conf_file.c \ src/core/ngx_garbage_collector.c" |