diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-21 12:30:30 +0000 |
| commit | b1dfe478a03ad6919f174812951f6a2bec8befae (patch) | |
| tree | d8802484f8dbf5309b17a95b5fc9749627720a53 /auto/os | |
| parent | 5275a8b3ac534ff36973801ec2aa6ce1214d7cc9 (diff) | |
| download | nginx-release-0.1.13.tar.gz nginx-release-0.1.13.tar.bz2 | |
nginx-0.1.13-RELEASE importrelease-0.1.13
*) Feature: the server_names_hash and server_names_hash_threshold
directives.
*) Bugfix: the *.domain.tld names in the "server_name" directive did
not work.
*) Bugfix: the %request_length log parameter logged the incorrect
length.
Diffstat (limited to 'auto/os')
| -rw-r--r-- | auto/os/conf | 4 | ||||
| -rw-r--r-- | auto/os/linux | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/auto/os/conf b/auto/os/conf index f64483bda..dcbda8857 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -45,9 +45,7 @@ esac if [ $NGX_PLATFORM != win32 ]; then - if test -z "$NGX_USER"; then - NGX_USER=nobody - fi + NGX_USER=${NGX_USER:-nobody} if [ -z "$NGX_GROUP" -a $NGX_USER = nobody ] ; then if grep nobody /etc/group 2>&1 >/dev/null; then diff --git a/auto/os/linux b/auto/os/linux index f3c6722c4..8c140b388 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -26,6 +26,8 @@ CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \ | sed -e 's/^.* \(.*\)$/\1/'` +version=${version:-0} + # enable the rt signals on Linux 2.2.19 and onward |