diff options
Diffstat (limited to '')
| -rw-r--r-- | auto/modules | 5 | ||||
| -rw-r--r-- | auto/options | 7 | ||||
| -rw-r--r-- | auto/os/conf | 21 | ||||
| -rw-r--r-- | auto/os/linux | 6 | ||||
| -rw-r--r-- | auto/types/value | 2 | ||||
| -rwxr-xr-x | auto/unix | 26 |
6 files changed, 34 insertions, 33 deletions
diff --git a/auto/modules b/auto/modules index f02e80337..b793b349b 100644 --- a/auto/modules +++ b/auto/modules @@ -45,6 +45,11 @@ if [ $NGX_TEST_BUILD_RTSIG = YES ]; then CORE_SRCS="$CORE_SRCS $RTSIG_SRCS" fi +if [ $NGX_TEST_BUILD_SOLARIS_SENDFILEV = YES ]; then + have=NGX_TEST_BUILD_SOLARIS_SENDFILEV . auto/have + CORE_SRCS="$CORE_SRCS $SOLARIS_SENDFILEV_SRCS" +fi + # the filter order is important # ngx_http_write_filter diff --git a/auto/options b/auto/options index 266ea3115..834ca010e 100644 --- a/auto/options +++ b/auto/options @@ -25,6 +25,7 @@ CPU=NO NGX_TEST_BUILD_DEVPOLL=NO NGX_TEST_BUILD_EPOLL=NO NGX_TEST_BUILD_RTSIG=NO +NGX_TEST_BUILD_SOLARIS_SENDFILEV=NO NGX_PLATFORM= NGX_WINE= @@ -146,6 +147,7 @@ do --test-build-devpoll) NGX_TEST_BUILD_DEVPOLL=YES ;; --test-build-epoll) NGX_TEST_BUILD_EPOLL=YES ;; --test-build-rtsig) NGX_TEST_BUILD_RTSIG=YES ;; + --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; *) echo "$0: error: invalid option \"$option\"" @@ -212,11 +214,6 @@ if test -z "$NGX_PREFIX"; then fi -if test -z "$NGX_GROUP"; then - NGX_GROUP=NGX_USER -fi - - case ".$NGX_SBIN_PATH" in ./*) ;; diff --git a/auto/os/conf b/auto/os/conf index 568b718d2..f64483bda 100644 --- a/auto/os/conf +++ b/auto/os/conf @@ -47,7 +47,26 @@ if [ $NGX_PLATFORM != win32 ]; then if test -z "$NGX_USER"; then NGX_USER=nobody - NGX_GROUP=nobody + fi + + if [ -z "$NGX_GROUP" -a $NGX_USER = nobody ] ; then + if grep nobody /etc/group 2>&1 >/dev/null; then + echo "checking for nobody group ... found" + NGX_GROUP=nobody + else + echo "checking for nobody group ... not found" + + if grep nogroup /etc/group 2>&1 >/dev/null; then + echo "checking for nogroup group ... found" + NGX_GROUP=nogroup + else + echo "checking for nogroup group ... not found" + NGX_GROUP=nobody + fi + fi + + else + NGX_GROUP=$NGX_USER fi diff --git a/auto/os/linux b/auto/os/linux index 687377b6e..f3c6722c4 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -21,12 +21,6 @@ ngx_spacer=' CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" -if test -z "$NGX_USER"; then - NGX_USER=nobody - NGX_GROUP=nogroup -fi - - # Linux kernel version version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \ diff --git a/auto/types/value b/auto/types/value index d823ab323..698ba7d92 100644 --- a/auto/types/value +++ b/auto/types/value @@ -7,3 +7,5 @@ cat << END >> $NGX_AUTO_CONFIG_H #ifndef $ngx_param #define $ngx_param $ngx_value #endif + +END @@ -43,31 +43,15 @@ ngx_type="rlim_t"; ngx_types="int"; . auto/types/typedef . auto/endianess +ngx_type="size_t"; . auto/types/sizeof +ngx_param=MAX_SIZE_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value -# printf() formats +ngx_type="off_t"; . auto/types/sizeof +ngx_param=MAX_OFF_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value -#CC_WARN=$CC_STRONG -#ngx_fmt_collect=no -# -#ngx_fmt_name=OFF_T_FMT; ngx_type="off_t"; . auto/types/sizeof -ngx_param=OFF_T_MAX_VALUE; ngx_value=$ngx_max_value; . auto/types/value -#eval ngx_formats=\${ngx_${ngx_size}_fmt}; . auto/fmt/fmt -# -#ngx_fmt_name=TIME_T_FMT; ngx_type="time_t"; . auto/types/sizeof +ngx_type="time_t"; . auto/types/sizeof ngx_param=TIME_T_SIZE; ngx_value=$ngx_size; . auto/types/value ngx_param=TIME_T_LEN; ngx_value=$ngx_max_len; . auto/types/value -#eval ngx_formats=\${ngx_${ngx_size}_fmt}; . auto/fmt/fmt -# -#ngx_fmt_name=SIZE_T_FMT; ngx_type="size_t"; . auto/types/sizeof -#eval ngx_formats=\${ngx_${ngx_size}_fmt}; . auto/fmt/fmt -# -#ngx_fmt_name=SIZE_T_X_FMT; . auto/fmt/xfmt -# -#ngx_fmt_name=PID_T_FMT; ngx_type="pid_t"; . auto/types/sizeof -#eval ngx_formats=\${ngx_${ngx_size}_fmt}; . auto/fmt/fmt -# -#ngx_fmt_name=RLIM_T_FMT; ngx_type="rlim_t"; . auto/types/sizeof -#eval ngx_formats=\${ngx_${ngx_size}_fmt}; . auto/fmt/fmt # syscalls, libc calls and some features |