nginx-0.1.8-RELEASE importrelease-0.1.8

    *) Bugfix: in the ngx_http_autoindex_module if the long file names were
       in the listing.

    *) Feature: the "^~" modifier in the location directive.

    *) Feature: the proxy_max_temp_file_size directive.

2 files changed, 17 insertions, 6 deletions

diff --git a/auto/os/freebsd b/auto/os/freebsd
index f08ef97b0..ba2e18805 100644
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@@ -97,9 +97,20 @@ fi
 
 
 if [ $EVENT_AIO = YES ]; then
-    have=HAVE_AIO . auto/have
-    EVENT_MODULES="$EVENT_MODULES $AIO_MODULE"
-    CORE_SRCS="$CORE_SRCS $AIO_SRCS"
-else
-    have=HAVE_AIO . auto/nohave
+    if [ \( $version -lt 500000 -a $version -ge 430000 \) \
+         -o $version -ge 500014 ]
+    then
+        have=HAVE_AIO . auto/have
+        EVENT_MODULES="$EVENT_MODULES $AIO_MODULE"
+        CORE_SRCS="$CORE_SRCS $AIO_SRCS"
+    else
+
+cat << END
+
+$0: error: the kqueue does not support AIO on this FreeBSD version
+
+END
+
+        exit 1
+    fi
 fi
diff --git a/auto/os/linux b/auto/os/linux
index 8518c6170..e4cbd6d03 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -48,7 +48,7 @@ fi
 
 ngx_feature="epoll"
 ngx_feature_name="epoll"
-ngx_feature_run=yes
+ngx_feature_run=no
 ngx_feature_incs="#include <sys/epoll.h>"
 ngx_feature_libs=
 ngx_feature_test="int efd = 0, fd = 1, n;