mirror of
https://github.com/nginx/nginx.git
synced 2024-12-12 18:29:00 +08:00
1b73583ba2
*) Bugfix: on Solaris and Linux there may be too many "recvmsg()
returned not enough data" alerts.
*) Bugfix: there were the "writev() failed (22: Invalid argument)"
errors on Solaris in proxy mode without sendfile. On other platforms
that do not support sendfile at all the process got caught in an
endless loop.
*) Bugfix: segmentation fault on Solaris in proxy mode and using
sendfile.
*) Bugfix: segmentation fault on Solaris.
*) Bugfix: on-line upgrade did not work on Linux.
*) Bugfix: the ngx_http_autoindex_module module did not escape the
spaces, the quotes, and the percent signs in the directory listing.
*) Change: the decrease of the copy operations.
*) Feature: the userid_p3p directive.
114 lines
2.5 KiB
Plaintext
114 lines
2.5 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
cat << END >> $NGX_AUTO_HEADERS_H
|
|
|
|
#ifndef NGX_LINUX
|
|
#define NGX_LINUX 1
|
|
#endif
|
|
|
|
END
|
|
|
|
CORE_INCS="$UNIX_INCS"
|
|
CORE_DEPS="$UNIX_DEPS $LINUX_DEPS"
|
|
CORE_SRCS="$UNIX_SRCS $LINUX_SRCS"
|
|
EVENT_MODULES="$EVENT_MODULES"
|
|
|
|
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 \
|
|
| sed -e 's/^.* \(.*\)$/\1/'`
|
|
|
|
|
|
# enable the rt signals on Linux 2.2.19 and onward
|
|
|
|
if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then
|
|
echo " + using rt signals"
|
|
have=HAVE_RTSIG . auto/have
|
|
EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE"
|
|
CORE_SRCS="$CORE_SRCS $RTSIG_SRCS"
|
|
EVENT_FOUND=YES
|
|
fi
|
|
|
|
|
|
# epoll, EPOLLET version
|
|
|
|
ngx_feature="epoll"
|
|
ngx_feature_name="epoll"
|
|
ngx_feature_run=yes
|
|
ngx_feature_incs="#include <sys/epoll.h>"
|
|
ngx_feature_libs=
|
|
ngx_feature_test="int efd = 0, fd = 1, n;
|
|
struct epoll_event ee;
|
|
ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
|
|
ee.data.ptr = NULL;
|
|
efd = epoll_create(100);
|
|
if (efd == -1) return 1;"
|
|
. auto/feature
|
|
|
|
if [ $ngx_found = yes ]; then
|
|
have=HAVE_EPOLL . auto/have
|
|
have=HAVE_CLEAR_EVENT . auto/have
|
|
CORE_SRCS="$CORE_SRCS $EPOLL_SRCS"
|
|
EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE"
|
|
EVENT_FOUND=YES
|
|
fi
|
|
|
|
|
|
# sendfile()
|
|
|
|
CC_AUX_FLAGS="-D_GNU_SOURCE"
|
|
ngx_feature="sendfile()"
|
|
ngx_feature_name="sendfile"
|
|
ngx_feature_run=no
|
|
ngx_feature_incs="#include <sys/sendfile.h>"
|
|
ngx_feature_libs=
|
|
ngx_feature_test="int s = 0, fd = 1;
|
|
ssize_t n; off_t off = 0;
|
|
n = sendfile(s, fd, &off, 1)"
|
|
. auto/feature
|
|
|
|
if [ $ngx_found = yes ]; then
|
|
CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS"
|
|
fi
|
|
|
|
|
|
# sendfile64()
|
|
|
|
CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
|
|
ngx_feature="sendfile64()"
|
|
ngx_feature_name="HAVE_SENDFILE64"
|
|
ngx_feature_run=no
|
|
ngx_feature_incs="#include <sys/sendfile.h>"
|
|
ngx_feature_libs=
|
|
ngx_feature_test="int s = 0, fd = 1;
|
|
ssize_t n; off_t off = 0;
|
|
n = sendfile(s, fd, &off, 1)"
|
|
. auto/feature
|
|
|
|
|
|
ngx_include="sys/prctl.h"; . auto/include
|
|
|
|
# prctl(PR_SET_DUMPABLE)
|
|
|
|
ngx_feature="prctl(PR_SET_DUMPABLE)"
|
|
ngx_feature_name="HAVE_PR_SET_DUMPABLE"
|
|
ngx_feature_run=yes
|
|
ngx_feature_incs="#include <sys/prctl.h>"
|
|
ngx_feature_libs=
|
|
ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1"
|
|
. auto/feature
|