diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-19 13:42:59 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-19 13:42:59 +0000 |
| commit | bc55ea07c84aea4fdc4014250dab4fb6f5db9d7b (patch) | |
| tree | 11fb7f38e0ea9e750e48f6826c4a7fb191997bf8 /src | |
| parent | aa9a761f88caf2b897266b1bbbee3b77c5337909 (diff) | |
| download | nginx-bc55ea07c84aea4fdc4014250dab4fb6f5db9d7b.tar.gz nginx-bc55ea07c84aea4fdc4014250dab4fb6f5db9d7b.tar.bz2 | |
use content type of the parent request in SSI stub block output
instead of default one
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 2520cdbe5..d95b297ba 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -2061,9 +2061,9 @@ ngx_http_ssi_stub_output(ngx_http_request_t *r, void *data, ngx_int_t rc) out = data; if (!r->header_sent) { - if (ngx_http_set_content_type(r) != NGX_OK) { - return NGX_ERROR; - } + r->headers_out.content_type_len = + r->parent->headers_out.content_type_len; + r->headers_out.content_type = r->parent->headers_out.content_type; if (ngx_http_send_header(r) == NGX_ERROR) { return NGX_ERROR; |