IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-05 21:53:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

clear Last-Modified; set content-type and length for main request only

Browse Source
This commit is contained in:
Igor Sysoev 2008-08-06 13:18:57 +00:00
parent f36ae41e36
commit f98f98610e
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/http/modules/ngx_http_xslt_filter_module.c
View File

@ -332,11 +332,15 @@ ngx_http_xslt_send(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx,
NGX_HTTP_INTERNAL_SERVER_ERROR); NGX_HTTP_INTERNAL_SERVER_ERROR);
} }
r->headers_out.content_length_n = b->last - b->pos; if (r == r->main) {
r->headers_out.content_length_n = b->last - b->pos;
if (r->headers_out.content_length) { if (r->headers_out.content_length) {
r->headers_out.content_length->hash = 0; r->headers_out.content_length->hash = 0;
r->headers_out.content_length = NULL; r->headers_out.content_length = NULL;
}
ngx_http_clear_last_modified(r);
} }
rc = ngx_http_next_header_filter(r); rc = ngx_http_next_header_filter(r);
@ -785,7 +789,13 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
/* there must be at least one stylesheet */ /* there must be at least one stylesheet */
type = ngx_http_xslt_content_type(sheet[i - 1].stylesheet); if (r == r->main) {
type = ngx_http_xslt_content_type(sheet[i - 1].stylesheet);
} else {
type = NULL;
}
encoding = ngx_http_xslt_encoding(sheet[i - 1].stylesheet); encoding = ngx_http_xslt_encoding(sheet[i - 1].stylesheet);
doc_type = doc->type; doc_type = doc->type;
@ -821,6 +831,15 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
b->memory = 1; b->memory = 1;
b->last_buf = 1; b->last_buf = 1;
if (encoding) {
r->headers_out.charset.len = ngx_strlen(encoding);
r->headers_out.charset.data = encoding;
}
if (r != r->main) {
return b;
}
if (type) { if (type) {
len = ngx_strlen(type); len = ngx_strlen(type);
@ -835,11 +854,6 @@ ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r,
r->headers_out.content_type.data = (u_char *) "text/html"; r->headers_out.content_type.data = (u_char *) "text/html";
} }
if (encoding) {
r->headers_out.charset.len = ngx_strlen(encoding);
r->headers_out.charset.data = encoding;
}
return b; return b;
} }