diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-04-19 16:36:08 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-04-19 16:36:08 +0000 |
| commit | 978dabaf1fdc2c8d190eaae1ff07f5100bf0e245 (patch) | |
| tree | f7d0ea97ff7276a5a81c28f117751e24ee048e8f /src | |
| parent | 9bfb434d241816749077e21f499b8efd41c3625d (diff) | |
| download | nginx-978dabaf1fdc2c8d190eaae1ff07f5100bf0e245.tar.gz nginx-978dabaf1fdc2c8d190eaae1ff07f5100bf0e245.zip | |
nginx-0.0.3-2004-04-19-20:36:08 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/event/modules/ngx_select_module.c | 4 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_gzip_filter.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/event/modules/ngx_select_module.c b/src/event/modules/ngx_select_module.c index b995b7b69..23566cf62 100644 --- 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 cf3910c56..a455fe155 100644 --- 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; } |