diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 15:34:38 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-10-21 15:34:38 +0000 |
| commit | c0edbcce58b03b89c70f1eb39cb44c74c4c7453a (patch) | |
| tree | 1ce72a5b51d724a0c054e079c2b1507ca85a145d /auto/os/freebsd | |
| parent | ac64333a44f39d5a658832517a106961f32f6aae (diff) | |
| download | nginx-release-0.1.2.tar.gz nginx-release-0.1.2.tar.bz2 | |
nginx-0.1.2-RELEASE importrelease-0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
Diffstat (limited to 'auto/os/freebsd')
| -rw-r--r-- | auto/os/freebsd | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/auto/os/freebsd b/auto/os/freebsd index 90cb49702..f08ef97b0 100644 --- a/auto/os/freebsd +++ b/auto/os/freebsd @@ -2,19 +2,33 @@ # Copyright (C) Igor Sysoev +cat << END >> $NGX_AUTO_HEADERS_H + +#ifndef NGX_FREEBSD +#define NGX_FREEBSD 1 +#endif + +END + + CORE_INCS="$UNIX_INCS" CORE_DEPS="$UNIX_DEPS $FREEBSD_DEPS" CORE_SRCS="$UNIX_SRCS $FREEBSD_SRCS" -PIPE="-pipe" +ngx_spacer=' +' -# __FreeBSD_version is the best way to determine whether -# some capability exists and is safe to use +# __FreeBSD_version and sysctl kern.osreldate are the best ways +# to determine whether some capability exists and is safe to use. +# __FreeBSD_version is used for the testing of the build enviroment. +# sysctl kern.osreldate is used for the testing of the kernel capabilities. version=`grep "#define __FreeBSD_version" /usr/include/osreldate.h \ | sed -e 's/^.* \(.*\)$/\1/'` +osreldate=`/sbin/sysctl -n kern.osreldate` + # setproctitle() in libutil @@ -28,7 +42,7 @@ fi # sendfile -if [ $version -gt 300007 ]; then +if [ $osreldate -gt 300007 ]; then echo " + using sendfile()" have=HAVE_SENDFILE . auto/have @@ -38,8 +52,8 @@ fi # kqueue -if [ \( $version -lt 500000 -a $version -ge 410000 \) \ - -o $version -ge 500011 ] +if [ \( $osreldate -lt 500000 -a $osreldate -ge 410000 \) \ + -o $osreldate -ge 500011 ] then echo " + using kqueue" @@ -50,6 +64,8 @@ then EVENT_FOUND=YES fi +NGX_KQUEUE_CHECKED=YES + # kqueue's NOTE_LAWAT |