# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1095140722 0
# Node ID 84c52790823717ba2a52c7959cc1f2a78b905d25
# Parent  fda5987b188dd5f3d92010ee617132d147a4726b
nginx-0.0.10-2004-09-14-09:45:22 import

diff --git a/auto/options b/auto/options
--- a/auto/options
+++ b/auto/options
@@ -161,6 +161,18 @@ if [ $help = yes ]; then
 fi
 
 
+if [ $HTTP = NO ]; then
+    HTTP_CHARSET=NO
+    HTTP_GZIP=NO
+    HTTP_SSI=NO
+    HTTP_USERID=NO
+    HTTP_ACCESS=NO
+    HTTP_STATUS=NO
+    HTTP_REWRITE=NO
+    HTTP_PROXY=NO
+fi
+
+
 if [ ".$PLATFORM" = ".win32" -a $EVENT_POLL = YES ]; then
     EVENT_POLL=NO
     echo "$0: warning: --with-poll_module option is ignored for win32"
diff --git a/auto/summary b/auto/summary
--- a/auto/summary
+++ b/auto/summary
@@ -8,32 +8,32 @@ if [ $USE_PCRE = DISABLED ]; then
 
 else
     case $PCRE in
-        YES)   echo " + using system PCRE library" ;;
-        NONE)  echo " + PCRE library is not used" ;;
-        NO)    echo " + PCRE library is not found" ;;
-        *)     echo " + using PCRE library: $PCRE" ;;
+        YES)   echo "  using system PCRE library" ;;
+        NONE)  echo "  PCRE library is not used" ;;
+        NO)    echo "  PCRE library is not found" ;;
+        *)     echo "  using PCRE library: $PCRE" ;;
     esac
 fi
 
 case $MD5 in
-    YES)   echo " + md5: using system $MD5_LIB library" ;;
-    NONE)  echo " + md5 library is not used" ;;
-    NO)    echo " + md5 library is not found" ;;
-    *)     echo " + using md5 library: $MD5" ;;
+    YES)   echo "  md5: using system $MD5_LIB library" ;;
+    NONE)  echo "  md5 library is not used" ;;
+    NO)    echo "  md5 library is not found" ;;
+    *)     echo "  using md5 library: $MD5" ;;
 esac
 
 case $OPENSSL in
-    YES)   echo " + using system OpenSSL library" ;;
-    NONE)  echo " + OpenSSL library is not used" ;;
-    NO)    echo " + OpenSSL library is not found" ;;
-    *)     echo " + using OpenSSL library: $OPENSSL" ;;
+    YES)   echo "  using system OpenSSL library" ;;
+    NONE)  echo "  OpenSSL library is not used" ;;
+    NO)    echo "  OpenSSL library is not found" ;;
+    *)     echo "  using OpenSSL library: $OPENSSL" ;;
 esac
 
 case $ZLIB in
-    YES)   echo " + using system zlib library" ;;
-    NONE)  echo " + zlib library is not used" ;;
-    NO)    echo " + zlib library is not found" ;;
-    *)     echo " + using zlib library: $ZLIB" ;;
+    YES)   echo "  using system zlib library" ;;
+    NONE)  echo "  zlib library is not used" ;;
+    NO)    echo "  zlib library is not found" ;;
+    *)     echo "  using zlib library: $ZLIB" ;;
 esac
 
 echo
@@ -65,10 +65,10 @@ if [ $HTTP_GZIP = YES ]; then
 fi
 
 
-echo " nginx path prefix: $PREFIX"
-echo " nginx binary file: $SBIN_PATH"
-echo " nginx configuration file: $CONF_PATH"
-echo " nginx pid file: $PID_PATH"
-echo " nginx error log file: $ERROR_LOG_PATH"
-echo " nginx http access log file: $HTTP_LOG_PATH"
+echo "  nginx path prefix: $PREFIX"
+echo "  nginx binary file: $SBIN_PATH"
+echo "  nginx configuration file: $CONF_PATH"
+echo "  nginx pid file: $PID_PATH"
+echo "  nginx error log file: $ERROR_LOG_PATH"
+echo "  nginx http access log file: $HTTP_LOG_PATH"
 echo
diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h
--- a/src/http/ngx_http_config.h
+++ b/src/http/ngx_http_config.h
@@ -45,7 +45,7 @@ typedef struct {
 
 /*
  * ngx_http_conf_get_module_srv_conf() and ngx_http_conf_get_module_loc_conf()
- * msut not be used because at the merge phase cf->ctx points to http{}'s ctx
+ * must not be used at the merge phase because cf->ctx points to http{}'s ctx
  */
 
 #define ngx_http_conf_get_module_main_conf(cf, module)                        \
diff --git a/src/imap/ngx_imap.h b/src/imap/ngx_imap.h
--- a/src/imap/ngx_imap.h
+++ b/src/imap/ngx_imap.h
@@ -66,9 +66,11 @@ typedef struct {
 #define NGX_IMAP_PROXY_ERROR    11
 
 
-#define NGX_IMAP_MODULE    0x50414D49     /* "IMAP" */
+#define NGX_IMAP_MODULE      0x50414D49     /* "IMAP" */
 
-#define NGX_IMAP_CONF      0x02000000
+#define NGX_IMAP_SRV_CONF    0x02000000
+#define NGX_IMAP_IMAP_CONF   0x04000000
+#define NGX_IMAP_POP3_CONF   0x08000000
 
 
 void ngx_imap_init_connection(ngx_connection_t *c);