commit 978dabaf1fdc2c8d190eaae1ff07f5100bf0e245
author Igor Sysoev <igor@sysoev.ru> Mon Apr 19 16:36:08 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Apr 19 16:36:08 2004 +0000
tree f7d0ea97ff7276a5a81c28f117751e24ee048e8f
parent 9bfb434d241816749077e21f499b8efd41c3625d

nginx-0.0.3-2004-04-19-20:36:08 import

src/event/modules/ngx_select_module.c

diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index b995b7b..23566cf 100644
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -566,6 +566,10 @@
 
     ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);
 
+    if (ecf->use != ngx_select_module.ctx_index) {
+        return NGX_CONF_OK;
+    }
+
     /* disable warning: the default FD_SETSIZE is 1024U in FreeBSD 5.x */
 
     if ((unsigned) ecf->connections > FD_SETSIZE) {

src/http/modules/ngx_http_gzip_filter.c

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index cf3910c..a455fe1 100644
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -261,7 +261,7 @@
     /* TODO: "text/html" -> custom types */
     if (r->headers_out.content_type
         && ngx_strncasecmp(r->headers_out.content_type->value.data,
-                                                          "text/html", 5) != 0)
+                                                          "text/html", 9) != 0)
     {
         return ngx_http_next_header_filter(r);
     }
@@ -365,22 +365,19 @@
     if (r->headers_out.cache_control) {
 
         if ((conf->proxied & NGX_HTTP_GZIP_PROXIED_NO_CACHE)
-            && ngx_strstr(r->headers_out.cache_control->value.data, "no-cache")
-                                                                       == NULL)
+            && ngx_strstr(r->headers_out.cache_control->value.data, "no-cache"))
         {
             return NGX_OK;
         }
 
         if ((conf->proxied & NGX_HTTP_GZIP_PROXIED_NO_STORE)
-            && ngx_strstr(r->headers_out.cache_control->value.data, "no-store")
-                                                                       == NULL)
+            && ngx_strstr(r->headers_out.cache_control->value.data, "no-store"))
         {
             return NGX_OK;
         }
 
         if ((conf->proxied & NGX_HTTP_GZIP_PROXIED_PRIVATE)
-            && ngx_strstr(r->headers_out.cache_control->value.data, "private")
-                                                                       == NULL)
+            && ngx_strstr(r->headers_out.cache_control->value.data, "private"))
         {
             return NGX_OK;
         }