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

diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c
index b995b7b6975f782af0eb9e25b498d5aab8965c2f..23566cf626788f263c35e6bc85dc398413707c17 100644 (file)
--- a/src/event/modules/ngx_select_module.c
+++ b/src/event/modules/ngx_select_module.c
@@ -566,6 +566,10 @@ static char *ngx_select_init_conf(ngx_cycle_t *cycle, void *conf)
 
     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) {

diff --git a/src/http/modules/ngx_http_gzip_filter.c b/src/http/modules/ngx_http_gzip_filter.c
index cf3910c56ec1ab1c3020c7334f0eae3cfa1ce2ac..a455fe155768f411726ab0b7df5cb36979fc769e 100644 (file)
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -261,7 +261,7 @@ static int ngx_http_gzip_header_filter(ngx_http_request_t *r)
     /* 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 @@ static int ngx_http_gzip_proxied(ngx_http_request_t *r,
     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;
         }