nginx-0.0.10-2004-09-05-23:54:02 import
diff --git a/auto/modules b/auto/modules
index be76fd8..d80a05c 100644
--- a/auto/modules
+++ b/auto/modules
@@ -126,11 +126,15 @@
     . $OBJS/auto
 fi
 
-modules="$CORE_MODULES $EVENT_MODULES $HTTP_MODULES $HTTP_FILTER_MODULES \
-         $HTTP_HEADERS_FILTER_MODULE \
-         $HTTP_COPY_FILTER_MODULE \
-         $HTTP_RANGE_BODY_FILTER_MODULE \
-         $HTTP_NOT_MODIFIED_FILTER_MODULE"
+modules="$CORE_MODULES $EVENT_MODULES"
+
+if [ $HTTP = YES ]; then
+    modules="$modules $HTTP_MODULES $HTTP_FILTER_MODULES \
+             $HTTP_HEADERS_FILTER_MODULE \
+             $HTTP_COPY_FILTER_MODULE \
+             $HTTP_RANGE_BODY_FILTER_MODULE \
+             $HTTP_NOT_MODIFIED_FILTER_MODULE"
+fi
 
 
 echo "#include <ngx_config.h>"                > $NGX_MODULES_C
diff --git a/auto/options b/auto/options
index c88e77f..538e6ad 100644
--- a/auto/options
+++ b/auto/options
@@ -29,6 +29,7 @@
 
 USE_THREADS=NO
 
+HTTP=YES
 HTTP_CHARSET=YES
 HTTP_GZIP=YES
 HTTP_SSL=NO
@@ -70,7 +71,6 @@
         --prefix=*)                      PREFIX="$value"            ;;
         --sbin-path=*)                   SBIN_PATH="$value"         ;;
         --conf-path=*)                   CONF_PATH="$value"         ;;
-        --http-log-path=*)               HTTP_LOG_PATH="$value"     ;;
         --error-log-path=*)              ERROR_LOG_PATH="$value"    ;;
         --pid-path=*)                    PID_PATH="$value"          ;;
 
@@ -88,6 +88,9 @@
         --with-threads=*)                USE_THREADS="$value"       ;;
         --with-threads)                  USE_THREADS="pthreads"     ;;
 
+        --without-http)                  HTTP=NO                    ;;
+        --http-log-path=*)               HTTP_LOG_PATH="$value"     ;;
+
         --with-http_ssl_module)          HTTP_SSL=YES               ;;
         --without-http_charset_module)   HTTP_CHARSET=NO            ;;
         --without-http_gzip_module)      HTTP_GZIP=NO               ;;