Mercurial > hg > nginx-ranges
diff src/http/modules/ngx_http_ssi_filter_module.c @ 397:05981f639d21 NGINX_0_7_9
nginx 0.7.9
*) Change: now ngx_http_charset_module works by default with following
MIME types: text/html, text/css, text/xml, text/plain,
text/vnd.wap.wml, application/x-javascript, and application/rss+xml.
*) Feature: the "charset_types" and "addition_types" directives.
*) Feature: now the "gzip_types", "ssi_types", and "sub_filter_types"
directives use hash.
*) Feature: the ngx_cpp_test_module.
*) Feature: the "expires" directive supports daily time.
*) Feature: the ngx_http_xslt_module improvements and bug fixing.
Thanks to Denis F. Latypoff and Maxim Dounin.
*) Bugfix: the "log_not_found" directive did not work for index files
tests.
*) Bugfix: HTTPS connections might hang, if kqueue, epoll, rtsig, or
eventport methods were used; the bug had appeared in 0.7.7.
*) Bugfix: if the "server_name", "valid_referers", and "map" directives
used an "*.domain.tld" wildcard and exact name "domain.tld" was not
set, then the exact name was matched by the wildcard; the bugs had
appeared in 0.3.18.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 12 Aug 2008 00:00:00 +0400 |
parents | 34fb3a573548 |
children | e7dbea1ee115 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -22,10 +22,12 @@ typedef struct { ngx_flag_t silent_errors; ngx_flag_t ignore_recycled_buffers; - ngx_array_t *types; /* array of ngx_str_t */ + ngx_hash_t types; size_t min_file_chunk; size_t value_len; + + ngx_array_t *types_keys; } ngx_http_ssi_loc_conf_t; @@ -102,8 +104,6 @@ static ngx_int_t ngx_http_ssi_endblock(n static ngx_int_t ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t gmt); -static char *ngx_http_ssi_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); - static ngx_int_t ngx_http_ssi_preconfiguration(ngx_conf_t *cf); static void *ngx_http_ssi_create_main_conf(ngx_conf_t *cf); static char *ngx_http_ssi_init_main_conf(ngx_conf_t *cf, void *conf); @@ -153,10 +153,10 @@ static ngx_command_t ngx_http_ssi_filte { ngx_string("ssi_types"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, - ngx_http_ssi_types, + ngx_http_types_slot, NGX_HTTP_LOC_CONF_OFFSET, - 0, - NULL }, + offsetof(ngx_http_ssi_loc_conf_t, types_keys), + &ngx_http_html_default_types[0] }, ngx_null_command }; @@ -316,36 +316,18 @@ static ngx_http_variable_t ngx_http_ssi static ngx_int_t ngx_http_ssi_header_filter(ngx_http_request_t *r) { - ngx_uint_t i; - ngx_str_t *type; ngx_http_ssi_ctx_t *ctx; ngx_http_ssi_loc_conf_t *slcf; slcf = ngx_http_get_module_loc_conf(r, ngx_http_ssi_filter_module); if (!slcf->enable - || r->headers_out.content_type.len == 0 - || r->headers_out.content_length_n == 0) + || r->headers_out.content_length_n == 0 + || ngx_http_test_content_type(r, &slcf->types) == NULL) { return ngx_http_next_header_filter(r); } - - type = slcf->types->elts; - for (i = 0; i < slcf->types->nelts; i++) { - if (r->headers_out.content_type.len >= type[i].len - && ngx_strncasecmp(r->headers_out.content_type.data, - type[i].data, type[i].len) == 0) - { - goto found; - } - } - - return ngx_http_next_header_filter(r); - - -found: - ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_ssi_ctx_t)); if (ctx == NULL) { return NGX_ERROR; @@ -2679,56 +2661,6 @@ ngx_http_ssi_date_gmt_local_variable(ngx } -static char * -ngx_http_ssi_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) -{ - ngx_http_ssi_loc_conf_t *slcf = conf; - - ngx_str_t *value, *type; - ngx_uint_t i; - - if (slcf->types == NULL) { - slcf->types = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t)); - if (slcf->types == NULL) { - return NGX_CONF_ERROR; - } - - type = ngx_array_push(slcf->types); - if (type == NULL) { - return NGX_CONF_ERROR; - } - - type->len = sizeof("text/html") - 1; - type->data = (u_char *) "text/html"; - } - - value = cf->args->elts; - - for (i = 1; i < cf->args->nelts; i++) { - - if (ngx_strcmp(value[i].data, "text/html") == 0) { - continue; - } - - type = ngx_array_push(slcf->types); - if (type == NULL) { - return NGX_CONF_ERROR; - } - - type->len = value[i].len; - - type->data = ngx_pnalloc(cf->pool, type->len + 1); - if (type->data == NULL) { - return NGX_CONF_ERROR; - } - - ngx_cpystrn(type->data, value[i].data, type->len + 1); - } - - return NGX_CONF_OK; -} - - static ngx_int_t ngx_http_ssi_preconfiguration(ngx_conf_t *cf) { @@ -2829,7 +2761,8 @@ ngx_http_ssi_create_loc_conf(ngx_conf_t /* * set by ngx_pcalloc(): * - * conf->types = NULL; + * conf->types = { NULL }; + * conf->types_keys = NULL; */ slcf->enable = NGX_CONF_UNSET; @@ -2849,8 +2782,6 @@ ngx_http_ssi_merge_loc_conf(ngx_conf_t * ngx_http_ssi_loc_conf_t *prev = parent; ngx_http_ssi_loc_conf_t *conf = child; - ngx_str_t *type; - ngx_conf_merge_value(conf->enable, prev->enable, 0); ngx_conf_merge_value(conf->silent_errors, prev->silent_errors, 0); ngx_conf_merge_value(conf->ignore_recycled_buffers, @@ -2859,24 +2790,12 @@ ngx_http_ssi_merge_loc_conf(ngx_conf_t * ngx_conf_merge_size_value(conf->min_file_chunk, prev->min_file_chunk, 1024); ngx_conf_merge_size_value(conf->value_len, prev->value_len, 256); - if (conf->types == NULL) { - if (prev->types == NULL) { - conf->types = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t)); - if (conf->types == NULL) { - return NGX_CONF_ERROR; - } - - type = ngx_array_push(conf->types); - if (type == NULL) { - return NGX_CONF_ERROR; - } - - type->len = sizeof("text/html") - 1; - type->data = (u_char *) "text/html"; - - } else { - conf->types = prev->types; - } + if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, + prev->types_keys, &prev->types, + ngx_http_html_default_types) + != NGX_OK) + { + return NGX_CONF_ERROR; } return NGX_CONF_OK;