nginx-0.1.13-RELEASE import
*) 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.
diff --git a/auto/os/conf b/auto/os/conf
index f64483b..dcbda88 100644
--- a/auto/os/conf
+++ b/auto/os/conf
@@ -45,9 +45,7 @@
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 f3c6722..8c140b3 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -26,6 +26,8 @@
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