Mercurial > hg > nginx
annotate src/http/modules/ngx_http_xslt_filter_module.c @ 3642:ac33852faaac
style fix
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 23 Jun 2010 16:34:54 +0000 |
| parents | dd1570b6f237 |
| children | 47c1a9bff989 |
| rev | line source |
|---|---|
| 2139 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 #include <libxml/parser.h> | |
| 12 #include <libxml/tree.h> | |
| 13 #include <libxslt/xslt.h> | |
| 14 #include <libxslt/xsltInternals.h> | |
| 15 #include <libxslt/transform.h> | |
| 16 #include <libxslt/xsltutils.h> | |
| 17 | |
| 2299 | 18 #if (NGX_HAVE_EXSLT) |
| 19 #include <libexslt/exslt.h> | |
| 20 #endif | |
| 21 | |
| 2139 | 22 |
| 23 #ifndef NGX_HTTP_XSLT_REUSE_DTD | |
| 24 #define NGX_HTTP_XSLT_REUSE_DTD 1 | |
| 25 #endif | |
| 26 | |
| 27 | |
| 28 typedef struct { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
29 u_char *name; |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
30 void *data; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
31 } ngx_http_xslt_file_t; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
32 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
33 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
34 typedef struct { |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
35 ngx_array_t dtd_files; /* ngx_http_xslt_file_t */ |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
36 ngx_array_t sheet_files; /* ngx_http_xslt_file_t */ |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
37 } ngx_http_xslt_filter_main_conf_t; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
38 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
39 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
40 typedef struct { |
| 2139 | 41 xsltStylesheetPtr stylesheet; |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
42 ngx_array_t params; /* ngx_http_complex_value_t */ |
| 2139 | 43 } ngx_http_xslt_sheet_t; |
| 44 | |
| 45 | |
| 46 typedef struct { | |
| 47 xmlDtdPtr dtd; | |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
48 ngx_array_t sheets; /* ngx_http_xslt_sheet_t */ |
| 2148 | 49 ngx_hash_t types; |
| 50 ngx_array_t *types_keys; | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
51 } ngx_http_xslt_filter_loc_conf_t; |
| 2139 | 52 |
| 53 | |
| 54 typedef struct { | |
| 55 xmlDocPtr doc; | |
| 56 xmlParserCtxtPtr ctxt; | |
| 57 xmlSAXHandler *sax; | |
| 58 ngx_http_request_t *request; | |
| 59 ngx_array_t params; | |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
60 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
61 ngx_uint_t done; /* unsigned done:1; */ |
| 2139 | 62 } ngx_http_xslt_filter_ctx_t; |
| 63 | |
| 64 | |
| 65 static ngx_int_t ngx_http_xslt_send(ngx_http_request_t *r, | |
| 66 ngx_http_xslt_filter_ctx_t *ctx, ngx_buf_t *b); | |
| 67 static ngx_int_t ngx_http_xslt_add_chunk(ngx_http_request_t *r, | |
| 68 ngx_http_xslt_filter_ctx_t *ctx, ngx_buf_t *b); | |
| 69 | |
| 70 | |
| 71 static void ngx_http_xslt_sax_start_document(void *data); | |
| 72 static void ngx_http_xslt_sax_end_document(void *data); | |
| 73 static void ngx_http_xslt_sax_internal_subset(void *data, const xmlChar *name, | |
| 74 const xmlChar *externalId, const xmlChar *systemId); | |
| 75 static void ngx_http_xslt_sax_external_subset(void *data, const xmlChar *name, | |
| 76 const xmlChar *externalId, const xmlChar *systemId); | |
| 77 static void ngx_http_xslt_sax_entity_decl(void *data, const xmlChar *name, | |
| 78 int type, const xmlChar *publicId, const xmlChar *systemId, | |
| 79 xmlChar *content); | |
| 80 static void ngx_http_xslt_sax_attribute_decl(void *data, const xmlChar *elem, | |
| 81 const xmlChar *fullname, int type, int def, const xmlChar *defaultValue, | |
| 82 xmlEnumerationPtr tree); | |
| 83 static void ngx_http_xslt_sax_element_decl(void *data, const xmlChar * name, | |
| 84 int type, xmlElementContentPtr content); | |
| 85 static void ngx_http_xslt_sax_notation_decl(void *data, const xmlChar *name, | |
| 86 const xmlChar *publicId, const xmlChar *systemId); | |
| 87 static void ngx_http_xslt_sax_unparsed_entity_decl(void *data, | |
| 88 const xmlChar *name, const xmlChar *publicId, const xmlChar *systemId, | |
| 89 const xmlChar *notationName); | |
| 90 static void ngx_http_xslt_sax_start_element(void *data, | |
| 91 const xmlChar *localname, const xmlChar *prefix, const xmlChar *URI, | |
| 92 int nb_namespaces, const xmlChar **namespaces, int nb_attributes, | |
| 93 int nb_defaulted, const xmlChar **attributes); | |
| 94 static void ngx_http_xslt_sax_end_element(void *data, | |
| 95 const xmlChar * localname ATTRIBUTE_UNUSED, | |
| 96 const xmlChar * prefix ATTRIBUTE_UNUSED, | |
| 97 const xmlChar * URI ATTRIBUTE_UNUSED); | |
| 98 static void ngx_http_xslt_sax_characters(void *data, const xmlChar *p, int len); | |
| 99 static void ngx_http_xslt_sax_cdata_block(void *data, const xmlChar *p, | |
| 100 int len); | |
| 101 static xmlEntityPtr ngx_http_xslt_sax_get_entity(void *data, | |
| 102 const xmlChar *name); | |
| 103 static xmlEntityPtr ngx_http_xslt_sax_get_parameter_entity(void *data, | |
| 104 const xmlChar *name); | |
| 105 static xmlParserInputPtr ngx_http_xslt_sax_resolve_entity(void *data, | |
| 106 const xmlChar *publicId, const xmlChar *systemId); | |
| 107 static void ngx_http_xslt_sax_reference(void *data, const xmlChar *name); | |
| 108 static void ngx_http_xslt_sax_comment(void *data, const xmlChar *value); | |
| 109 static void ngx_http_xslt_sax_processing_instruction(void *data, | |
| 110 const xmlChar *target, const xmlChar *pidata); | |
| 111 static int ngx_http_xslt_sax_is_standalone(void *data); | |
| 112 static int ngx_http_xslt_sax_has_internal_subset(void *data); | |
| 113 static int ngx_http_xslt_sax_has_external_subset(void *data); | |
| 114 static void ngx_cdecl ngx_http_xslt_sax_error(void *data, const char *msg, ...); | |
| 115 | |
| 116 | |
| 117 static ngx_buf_t *ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r, | |
| 118 ngx_http_xslt_filter_ctx_t *ctx); | |
| 119 static ngx_int_t ngx_http_xslt_params(ngx_http_request_t *r, | |
| 120 ngx_http_xslt_filter_ctx_t *ctx, ngx_array_t *params); | |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
121 static u_char *ngx_http_xslt_content_type(xsltStylesheetPtr s); |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
122 static u_char *ngx_http_xslt_encoding(xsltStylesheetPtr s); |
| 2139 | 123 static void ngx_http_xslt_cleanup(void *data); |
| 124 | |
| 125 static char *ngx_http_xslt_entities(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 126 void *conf); | |
| 127 static char *ngx_http_xslt_stylesheet(ngx_conf_t *cf, ngx_command_t *cmd, | |
| 128 void *conf); | |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
129 static void ngx_http_xslt_cleanup_dtd(void *data); |
| 2139 | 130 static void ngx_http_xslt_cleanup_stylesheet(void *data); |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
131 static void *ngx_http_xslt_filter_create_main_conf(ngx_conf_t *cf); |
| 2139 | 132 static void *ngx_http_xslt_filter_create_conf(ngx_conf_t *cf); |
| 133 static char *ngx_http_xslt_filter_merge_conf(ngx_conf_t *cf, void *parent, | |
| 134 void *child); | |
| 135 static ngx_int_t ngx_http_xslt_filter_init(ngx_conf_t *cf); | |
|
2196
fab3fa7339ff
call ngx_http_xslt_filter_exit()
Igor Sysoev <igor@sysoev.ru>
parents:
2159
diff
changeset
|
136 static void ngx_http_xslt_filter_exit(ngx_cycle_t *cycle); |
| 2139 | 137 |
| 138 | |
| 139 ngx_str_t ngx_http_xslt_default_types[] = { | |
| 140 ngx_string("text/xml"), | |
| 141 ngx_null_string | |
| 142 }; | |
| 143 | |
| 144 | |
| 145 static ngx_command_t ngx_http_xslt_filter_commands[] = { | |
| 146 | |
| 147 { ngx_string("xml_entities"), | |
|
2150
50cede290146
fix xslt module context levels
Igor Sysoev <igor@sysoev.ru>
parents:
2148
diff
changeset
|
148 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, |
| 2139 | 149 ngx_http_xslt_entities, |
| 150 NGX_HTTP_LOC_CONF_OFFSET, | |
| 151 0, | |
| 152 NULL }, | |
| 153 | |
| 154 { ngx_string("xslt_stylesheet"), | |
|
2151
c8331f70d799
xslt_stylesheet should be valid for location only
Igor Sysoev <igor@sysoev.ru>
parents:
2150
diff
changeset
|
155 NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
| 2139 | 156 ngx_http_xslt_stylesheet, |
| 157 NGX_HTTP_LOC_CONF_OFFSET, | |
| 158 0, | |
| 159 NULL }, | |
| 160 | |
| 161 { ngx_string("xslt_types"), | |
|
2150
50cede290146
fix xslt module context levels
Igor Sysoev <igor@sysoev.ru>
parents:
2148
diff
changeset
|
162 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_1MORE, |
| 2139 | 163 ngx_http_types_slot, |
| 164 NGX_HTTP_LOC_CONF_OFFSET, | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
165 offsetof(ngx_http_xslt_filter_loc_conf_t, types_keys), |
| 2139 | 166 &ngx_http_xslt_default_types[0] }, |
| 167 | |
| 168 ngx_null_command | |
| 169 }; | |
| 170 | |
| 171 | |
| 172 static ngx_http_module_t ngx_http_xslt_filter_module_ctx = { | |
| 173 NULL, /* preconfiguration */ | |
| 174 ngx_http_xslt_filter_init, /* postconfiguration */ | |
| 175 | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
176 ngx_http_xslt_filter_create_main_conf, /* create main configuration */ |
| 2139 | 177 NULL, /* init main configuration */ |
| 178 | |
| 179 NULL, /* create server configuration */ | |
| 180 NULL, /* merge server configuration */ | |
| 181 | |
| 182 ngx_http_xslt_filter_create_conf, /* create location configuration */ | |
| 183 ngx_http_xslt_filter_merge_conf /* merge location configuration */ | |
| 184 }; | |
| 185 | |
| 186 | |
| 187 ngx_module_t ngx_http_xslt_filter_module = { | |
| 188 NGX_MODULE_V1, | |
| 189 &ngx_http_xslt_filter_module_ctx, /* module context */ | |
| 190 ngx_http_xslt_filter_commands, /* module directives */ | |
| 191 NGX_HTTP_MODULE, /* module type */ | |
| 192 NULL, /* init master */ | |
| 193 NULL, /* init module */ | |
| 194 NULL, /* init process */ | |
| 195 NULL, /* init thread */ | |
| 196 NULL, /* exit thread */ | |
| 2983 | 197 ngx_http_xslt_filter_exit, /* exit process */ |
|
2196
fab3fa7339ff
call ngx_http_xslt_filter_exit()
Igor Sysoev <igor@sysoev.ru>
parents:
2159
diff
changeset
|
198 ngx_http_xslt_filter_exit, /* exit master */ |
| 2139 | 199 NGX_MODULE_V1_PADDING |
| 200 }; | |
| 201 | |
| 202 | |
| 203 static ngx_http_output_header_filter_pt ngx_http_next_header_filter; | |
| 204 static ngx_http_output_body_filter_pt ngx_http_next_body_filter; | |
| 205 | |
| 206 | |
| 207 static ngx_int_t | |
| 208 ngx_http_xslt_header_filter(ngx_http_request_t *r) | |
| 209 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
210 ngx_http_xslt_filter_ctx_t *ctx; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
211 ngx_http_xslt_filter_loc_conf_t *conf; |
| 2139 | 212 |
| 213 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 214 "xslt filter header"); | |
| 215 | |
| 216 if (r->headers_out.status == NGX_HTTP_NOT_MODIFIED) { | |
| 217 return ngx_http_next_header_filter(r); | |
| 218 } | |
| 219 | |
| 220 conf = ngx_http_get_module_loc_conf(r, ngx_http_xslt_filter_module); | |
| 221 | |
| 222 if (conf->sheets.nelts == 0 | |
| 2148 | 223 || ngx_http_test_content_type(r, &conf->types) == NULL) |
| 2139 | 224 { |
| 225 return ngx_http_next_header_filter(r); | |
| 226 } | |
| 227 | |
| 228 ctx = ngx_http_get_module_ctx(r, ngx_http_xslt_filter_module); | |
| 229 | |
| 230 if (ctx) { | |
| 231 return ngx_http_next_header_filter(r); | |
| 232 } | |
| 233 | |
| 234 ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_xslt_filter_ctx_t)); | |
| 235 if (ctx == NULL) { | |
| 236 return NGX_ERROR; | |
| 237 } | |
| 238 | |
| 239 ngx_http_set_ctx(r, ctx, ngx_http_xslt_filter_module); | |
| 240 | |
| 241 r->main_filter_need_in_memory = 1; | |
| 242 | |
| 243 return NGX_OK; | |
| 244 } | |
| 245 | |
| 246 | |
| 247 static ngx_int_t | |
| 248 ngx_http_xslt_body_filter(ngx_http_request_t *r, ngx_chain_t *in) | |
| 249 { | |
|
2984
097c1242995b
preserve XML wellFormed field before freeing memory
Igor Sysoev <igor@sysoev.ru>
parents:
2983
diff
changeset
|
250 int wellFormed; |
| 2139 | 251 ngx_chain_t *cl; |
| 252 ngx_http_xslt_filter_ctx_t *ctx; | |
| 253 | |
| 254 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 255 "xslt filter body"); | |
| 256 | |
| 257 if (in == NULL) { | |
| 258 return ngx_http_next_body_filter(r, in); | |
| 259 } | |
| 260 | |
| 261 ctx = ngx_http_get_module_ctx(r, ngx_http_xslt_filter_module); | |
| 262 | |
| 263 if (ctx == NULL || ctx->done) { | |
| 264 return ngx_http_next_body_filter(r, in); | |
| 265 } | |
| 266 | |
| 267 for (cl = in; cl; cl = cl->next) { | |
| 268 | |
| 269 if (ngx_http_xslt_add_chunk(r, ctx, cl->buf) != NGX_OK) { | |
| 270 | |
| 3642 | 271 if (ctx->ctxt->myDoc) { |
| 2139 | 272 |
| 273 #if (NGX_HTTP_XSLT_REUSE_DTD) | |
| 274 ctx->ctxt->myDoc->extSubset = NULL; | |
| 275 #endif | |
| 276 xmlFreeDoc(ctx->ctxt->myDoc); | |
| 277 } | |
| 278 | |
| 279 xmlFreeParserCtxt(ctx->ctxt); | |
| 280 | |
| 281 return ngx_http_xslt_send(r, ctx, NULL); | |
| 282 } | |
| 283 | |
|
2899
61d5b945730a
fix XSLT filter in SSI subrequests
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
284 if (cl->buf->last_buf || cl->buf->last_in_chain) { |
| 2139 | 285 |
| 286 ctx->doc = ctx->ctxt->myDoc; | |
| 287 | |
| 288 #if (NGX_HTTP_XSLT_REUSE_DTD) | |
| 289 ctx->doc->extSubset = NULL; | |
| 290 #endif | |
| 291 | |
|
2984
097c1242995b
preserve XML wellFormed field before freeing memory
Igor Sysoev <igor@sysoev.ru>
parents:
2983
diff
changeset
|
292 wellFormed = ctx->ctxt->wellFormed; |
|
097c1242995b
preserve XML wellFormed field before freeing memory
Igor Sysoev <igor@sysoev.ru>
parents:
2983
diff
changeset
|
293 |
| 2139 | 294 xmlFreeParserCtxt(ctx->ctxt); |
| 295 | |
|
2984
097c1242995b
preserve XML wellFormed field before freeing memory
Igor Sysoev <igor@sysoev.ru>
parents:
2983
diff
changeset
|
296 if (wellFormed) { |
| 2139 | 297 return ngx_http_xslt_send(r, ctx, |
| 298 ngx_http_xslt_apply_stylesheet(r, ctx)); | |
| 299 } | |
| 300 | |
| 301 xmlFreeDoc(ctx->doc); | |
| 302 | |
| 303 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 304 "not well formed XML document"); | |
| 305 | |
| 306 return ngx_http_xslt_send(r, ctx, NULL); | |
| 307 } | |
| 308 } | |
| 309 | |
| 310 return NGX_OK; | |
| 311 } | |
| 312 | |
| 313 | |
| 314 static ngx_int_t | |
| 315 ngx_http_xslt_send(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx, | |
| 316 ngx_buf_t *b) | |
| 317 { | |
| 318 ngx_int_t rc; | |
| 319 ngx_chain_t out; | |
| 320 ngx_pool_cleanup_t *cln; | |
| 321 | |
| 322 ctx->done = 1; | |
| 323 | |
| 324 if (b == NULL) { | |
|
2821
26e06e009ced
allow to pass image filter errors via the same location where the filter is set
Igor Sysoev <igor@sysoev.ru>
parents:
2787
diff
changeset
|
325 return ngx_http_filter_finalize_request(r, NULL, |
|
2787
3daf68f2efe3
ngx_http_filter_finalize_request() and ngx_http_clean_header()
Igor Sysoev <igor@sysoev.ru>
parents:
2588
diff
changeset
|
326 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 2139 | 327 } |
| 328 | |
| 329 cln = ngx_pool_cleanup_add(r->pool, 0); | |
| 330 | |
| 331 if (cln == NULL) { | |
| 332 ngx_free(b->pos); | |
|
2821
26e06e009ced
allow to pass image filter errors via the same location where the filter is set
Igor Sysoev <igor@sysoev.ru>
parents:
2787
diff
changeset
|
333 return ngx_http_filter_finalize_request(r, NULL, |
| 2139 | 334 NGX_HTTP_INTERNAL_SERVER_ERROR); |
| 335 } | |
| 336 | |
|
2159
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
337 if (r == r->main) { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
338 r->headers_out.content_length_n = b->last - b->pos; |
| 2139 | 339 |
|
2159
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
340 if (r->headers_out.content_length) { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
341 r->headers_out.content_length->hash = 0; |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
342 r->headers_out.content_length = NULL; |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
343 } |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
344 |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
345 ngx_http_clear_last_modified(r); |
| 2139 | 346 } |
| 347 | |
| 348 rc = ngx_http_next_header_filter(r); | |
| 349 | |
| 350 if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { | |
| 351 ngx_free(b->pos); | |
| 352 return rc; | |
| 353 } | |
| 354 | |
| 355 cln->handler = ngx_http_xslt_cleanup; | |
| 356 cln->data = b->pos; | |
| 357 | |
| 358 out.buf = b; | |
| 359 out.next = NULL; | |
| 360 | |
| 361 return ngx_http_next_body_filter(r, &out); | |
| 362 } | |
| 363 | |
| 364 | |
| 365 static ngx_int_t | |
| 366 ngx_http_xslt_add_chunk(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx, | |
| 367 ngx_buf_t *b) | |
| 368 { | |
| 369 int err; | |
| 370 xmlSAXHandler *sax; | |
| 371 xmlParserCtxtPtr ctxt; | |
| 372 | |
| 373 if (ctx->ctxt == NULL) { | |
| 374 | |
| 375 ctxt = xmlCreatePushParserCtxt(NULL, NULL, NULL, 0, NULL); | |
| 376 if (ctxt == NULL) { | |
| 377 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 378 "xmlCreatePushParserCtxt() failed"); | |
| 379 return NGX_ERROR; | |
| 380 } | |
| 381 | |
| 382 ctx->sax = ngx_palloc(r->pool, sizeof(xmlSAXHandler)); | |
| 383 if (ctx->sax == NULL) { | |
| 384 return NGX_ERROR; | |
| 385 } | |
| 386 | |
| 387 sax = ctxt->sax; | |
| 388 | |
| 389 ngx_memcpy(ctx->sax, sax, sizeof(xmlSAXHandler)); | |
| 390 | |
| 391 sax->startDocument = ngx_http_xslt_sax_start_document; | |
| 392 sax->endDocument = ngx_http_xslt_sax_end_document; | |
| 393 | |
| 394 sax->internalSubset = ngx_http_xslt_sax_internal_subset; | |
| 395 sax->externalSubset = ngx_http_xslt_sax_external_subset; | |
| 396 sax->entityDecl = ngx_http_xslt_sax_entity_decl; | |
| 397 sax->attributeDecl = ngx_http_xslt_sax_attribute_decl; | |
| 398 sax->elementDecl = ngx_http_xslt_sax_element_decl; | |
| 399 sax->notationDecl = ngx_http_xslt_sax_notation_decl; | |
| 400 sax->unparsedEntityDecl = ngx_http_xslt_sax_unparsed_entity_decl; | |
| 401 sax->setDocumentLocator = NULL; | |
| 402 | |
| 403 sax->startElementNs = ngx_http_xslt_sax_start_element; | |
| 404 sax->endElementNs = ngx_http_xslt_sax_end_element; | |
| 405 | |
| 406 sax->characters = ngx_http_xslt_sax_characters; | |
| 3115 | 407 sax->ignorableWhitespace = ngx_http_xslt_sax_characters; |
| 2139 | 408 sax->cdataBlock = ngx_http_xslt_sax_cdata_block; |
| 409 sax->getEntity = ngx_http_xslt_sax_get_entity; | |
| 410 sax->resolveEntity = ngx_http_xslt_sax_resolve_entity; | |
| 411 sax->getParameterEntity = ngx_http_xslt_sax_get_parameter_entity; | |
| 412 sax->reference = ngx_http_xslt_sax_reference; | |
| 413 sax->comment = ngx_http_xslt_sax_comment; | |
| 414 sax->processingInstruction = ngx_http_xslt_sax_processing_instruction; | |
| 415 | |
| 416 sax->isStandalone = ngx_http_xslt_sax_is_standalone; | |
| 417 sax->hasInternalSubset = ngx_http_xslt_sax_has_internal_subset; | |
| 418 sax->hasExternalSubset = ngx_http_xslt_sax_has_external_subset; | |
| 419 | |
| 420 sax->warning = NULL; | |
| 421 sax->error = ngx_http_xslt_sax_error; | |
| 422 sax->fatalError = ngx_http_xslt_sax_error; | |
| 423 | |
| 424 ctxt->userData = ctx; | |
| 425 | |
| 426 ctxt->replaceEntities = 1; | |
| 427 ctxt->loadsubset = 1; | |
| 428 | |
| 429 ctx->ctxt = ctxt; | |
| 430 ctx->request = r; | |
| 431 } | |
| 432 | |
|
2899
61d5b945730a
fix XSLT filter in SSI subrequests
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
433 err = xmlParseChunk(ctx->ctxt, (char *) b->pos, (int) (b->last - b->pos), |
|
61d5b945730a
fix XSLT filter in SSI subrequests
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
434 (b->last_buf) || (b->last_in_chain)); |
| 2139 | 435 |
| 436 if (err == 0) { | |
| 437 b->pos = b->last; | |
| 438 return NGX_OK; | |
| 439 } | |
| 440 | |
| 441 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 442 "xmlParseChunk() failed, error:%d", err); | |
| 443 | |
| 444 return NGX_ERROR; | |
| 445 } | |
| 446 | |
| 447 | |
| 448 static void | |
| 449 ngx_http_xslt_sax_start_document(void *data) | |
| 450 { | |
| 451 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 452 | |
| 453 ctx->sax->startDocument(ctx->ctxt); | |
| 454 } | |
| 455 | |
| 456 | |
| 457 static void | |
| 458 ngx_http_xslt_sax_end_document(void *data) | |
| 459 { | |
| 460 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 461 | |
| 462 ctx->sax->endDocument(ctx->ctxt); | |
| 463 } | |
| 464 | |
| 465 | |
| 466 static void | |
| 467 ngx_http_xslt_sax_internal_subset(void *data, const xmlChar *name, | |
| 468 const xmlChar *externalId, const xmlChar *systemId) | |
| 469 { | |
| 470 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 471 | |
| 472 ctx->sax->internalSubset(ctx->ctxt, name, externalId, systemId); | |
| 473 } | |
| 474 | |
| 475 | |
| 476 static void | |
| 477 ngx_http_xslt_sax_external_subset(void *data, const xmlChar *name, | |
| 478 const xmlChar *externalId, const xmlChar *systemId) | |
| 479 { | |
| 480 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 481 | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
482 xmlDocPtr doc; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
483 xmlDtdPtr dtd; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
484 ngx_http_request_t *r; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
485 ngx_http_xslt_filter_loc_conf_t *conf; |
| 2139 | 486 |
| 487 r = ctx->request; | |
| 488 | |
| 489 conf = ngx_http_get_module_loc_conf(r, ngx_http_xslt_filter_module); | |
| 490 | |
| 491 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 492 "xslt filter extSubset: \"%s\" \"%s\" \"%s\"", | |
| 493 name ? name : (xmlChar *) "", | |
| 494 externalId ? externalId : (xmlChar *) "", | |
| 495 systemId ? systemId : (xmlChar *) ""); | |
| 496 | |
| 497 doc = ctx->ctxt->myDoc; | |
| 498 | |
| 499 #if (NGX_HTTP_XSLT_REUSE_DTD) | |
| 500 | |
| 501 dtd = conf->dtd; | |
| 502 | |
| 503 #else | |
| 504 | |
| 505 dtd = xmlCopyDtd(conf->dtd); | |
| 506 if (dtd == NULL) { | |
| 507 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 508 "xmlCopyDtd() failed"); | |
| 509 return; | |
| 510 } | |
| 511 | |
| 512 if (doc->children == NULL) { | |
| 513 xmlAddChild((xmlNodePtr) doc, (xmlNodePtr) dtd); | |
| 514 | |
| 515 } else { | |
| 516 xmlAddPrevSibling(doc->children, (xmlNodePtr) dtd); | |
| 517 } | |
| 518 | |
| 519 #endif | |
| 520 | |
| 521 doc->extSubset = dtd; | |
| 522 } | |
| 523 | |
| 524 | |
| 525 static void | |
| 526 ngx_http_xslt_sax_entity_decl(void *data, const xmlChar *name, int type, | |
| 527 const xmlChar *publicId, const xmlChar *systemId, xmlChar *content) | |
| 528 { | |
| 529 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 530 | |
| 531 ctx->sax->entityDecl(ctx->ctxt, name, type, publicId, systemId, content); | |
| 532 } | |
| 533 | |
| 534 | |
| 535 static void | |
| 536 ngx_http_xslt_sax_attribute_decl(void *data, const xmlChar *elem, | |
| 537 const xmlChar *fullname, int type, int def, const xmlChar *defaultValue, | |
| 538 xmlEnumerationPtr tree) | |
| 539 { | |
| 540 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 541 | |
| 542 ctx->sax->attributeDecl(ctx->ctxt, elem, fullname, type, def, defaultValue, | |
| 543 tree); | |
| 544 } | |
| 545 | |
| 546 | |
| 547 static void | |
| 548 ngx_http_xslt_sax_element_decl(void *data, const xmlChar * name, int type, | |
| 549 xmlElementContentPtr content) | |
| 550 { | |
| 551 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 552 | |
| 553 ctx->sax->elementDecl(ctx->ctxt, name, type, content); | |
| 554 } | |
| 555 | |
| 556 | |
| 557 static void | |
| 558 ngx_http_xslt_sax_notation_decl(void *data, const xmlChar *name, | |
| 559 const xmlChar *publicId, const xmlChar *systemId) | |
| 560 { | |
| 561 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 562 | |
| 563 ctx->sax->notationDecl(ctx->ctxt, name, publicId, systemId); | |
| 564 } | |
| 565 | |
| 566 | |
| 567 static void | |
| 568 ngx_http_xslt_sax_unparsed_entity_decl(void *data, const xmlChar *name, | |
| 569 const xmlChar *publicId, const xmlChar *systemId, | |
| 570 const xmlChar *notationName) | |
| 571 { | |
| 572 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 573 | |
| 574 ctx->sax->unparsedEntityDecl(ctx->ctxt, name, publicId, systemId, | |
| 575 notationName); | |
| 576 } | |
| 577 | |
| 578 | |
| 579 static void | |
| 580 ngx_http_xslt_sax_start_element(void *data, const xmlChar *localname, | |
| 581 const xmlChar *prefix, const xmlChar *URI, int nb_namespaces, | |
| 582 const xmlChar **namespaces, int nb_attributes, int nb_defaulted, | |
| 583 const xmlChar **attributes) | |
| 584 { | |
| 585 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 586 | |
| 587 ctx->sax->startElementNs(ctx->ctxt, localname, prefix, URI, nb_namespaces, | |
| 588 namespaces, nb_attributes, nb_defaulted, attributes); | |
| 589 } | |
| 590 | |
| 591 | |
| 592 static void | |
| 593 ngx_http_xslt_sax_end_element(void *data, | |
| 594 const xmlChar * localname ATTRIBUTE_UNUSED, | |
| 595 const xmlChar * prefix ATTRIBUTE_UNUSED, | |
| 596 const xmlChar * URI ATTRIBUTE_UNUSED) | |
| 597 { | |
| 598 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 599 | |
| 600 ctx->sax->endElementNs(ctx->ctxt, localname, prefix, URI); | |
| 601 } | |
| 602 | |
| 603 | |
| 604 static void | |
| 605 ngx_http_xslt_sax_characters(void *data, const xmlChar *p, int len) | |
| 606 { | |
| 607 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 608 | |
| 609 ctx->sax->characters(ctx->ctxt, p, len); | |
| 610 } | |
| 611 | |
| 612 | |
| 613 static void | |
| 614 ngx_http_xslt_sax_cdata_block(void *data, const xmlChar *p, int len) | |
| 615 { | |
| 616 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 617 | |
| 618 ctx->sax->cdataBlock(ctx->ctxt, p, len); | |
| 619 } | |
| 620 | |
| 621 | |
| 622 static xmlEntityPtr | |
| 623 ngx_http_xslt_sax_get_entity(void *data, const xmlChar *name) | |
| 624 { | |
| 625 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 626 | |
| 627 return ctx->sax->getEntity(ctx->ctxt, name); | |
| 628 } | |
| 629 | |
| 630 | |
| 631 static xmlEntityPtr | |
| 632 ngx_http_xslt_sax_get_parameter_entity(void *data, const xmlChar *name) | |
| 633 { | |
| 634 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 635 | |
| 636 return ctx->sax->getParameterEntity(ctx->ctxt, name); | |
| 637 } | |
| 638 | |
| 639 | |
| 640 static xmlParserInputPtr | |
| 641 ngx_http_xslt_sax_resolve_entity(void *data, const xmlChar *publicId, | |
| 642 const xmlChar *systemId) | |
| 643 { | |
| 644 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 645 | |
| 646 return ctx->sax->resolveEntity(ctx->ctxt, publicId, systemId); | |
| 647 } | |
| 648 | |
| 649 | |
| 650 static void | |
| 651 ngx_http_xslt_sax_reference(void *data, const xmlChar *name) | |
| 652 { | |
| 653 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 654 | |
| 655 ctx->sax->reference(ctx->ctxt, name); | |
| 656 } | |
| 657 | |
| 658 | |
| 659 static void | |
| 660 ngx_http_xslt_sax_comment(void *data, const xmlChar *value) | |
| 661 { | |
| 662 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 663 | |
| 664 ctx->sax->comment(ctx->ctxt, value); | |
| 665 } | |
| 666 | |
| 667 | |
| 668 static void | |
| 669 ngx_http_xslt_sax_processing_instruction(void *data, const xmlChar *target, | |
| 670 const xmlChar *pidata) | |
| 671 { | |
| 672 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 673 | |
| 674 ctx->sax->processingInstruction(ctx->ctxt, target, pidata); | |
| 675 } | |
| 676 | |
| 677 | |
| 678 static int | |
| 679 ngx_http_xslt_sax_is_standalone(void *data) | |
| 680 { | |
| 681 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 682 | |
| 683 return ctx->sax->isStandalone(ctx->ctxt); | |
| 684 } | |
| 685 | |
| 686 | |
| 687 static int | |
| 688 ngx_http_xslt_sax_has_internal_subset(void *data) | |
| 689 { | |
| 690 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 691 | |
| 692 return ctx->sax->hasInternalSubset(ctx->ctxt); | |
| 693 } | |
| 694 | |
| 695 | |
| 696 static int | |
| 697 ngx_http_xslt_sax_has_external_subset(void *data) | |
| 698 { | |
| 699 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 700 | |
| 701 return ctx->sax->hasExternalSubset(ctx->ctxt); | |
| 702 } | |
| 703 | |
| 704 | |
| 705 static void ngx_cdecl | |
| 706 ngx_http_xslt_sax_error(void *data, const char *msg, ...) | |
| 707 { | |
| 708 ngx_http_xslt_filter_ctx_t *ctx = data; | |
| 709 | |
| 710 size_t n; | |
| 711 va_list args; | |
| 712 u_char buf[NGX_MAX_ERROR_STR]; | |
| 713 | |
| 714 buf[0] = '\0'; | |
| 715 | |
| 716 va_start(args, msg); | |
| 717 n = (size_t) vsnprintf((char *) buf, NGX_MAX_ERROR_STR, msg, args); | |
| 718 va_end(args); | |
| 719 | |
| 720 while (--n && (buf[n] == CR || buf[n] == LF)) { /* void */ } | |
| 721 | |
| 722 ngx_log_error(NGX_LOG_ERR, ctx->request->connection->log, 0, | |
| 2999 | 723 "libxml2 error: \"%*s\"", n + 1, buf); |
| 2139 | 724 } |
| 725 | |
| 726 | |
| 727 static ngx_buf_t * | |
| 728 ngx_http_xslt_apply_stylesheet(ngx_http_request_t *r, | |
| 729 ngx_http_xslt_filter_ctx_t *ctx) | |
| 730 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
731 int len, rc, doc_type; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
732 u_char *type, *encoding; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
733 ngx_buf_t *b; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
734 ngx_uint_t i; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
735 xmlChar *buf; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
736 xmlDocPtr doc, res; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
737 ngx_http_xslt_sheet_t *sheet; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
738 ngx_http_xslt_filter_loc_conf_t *conf; |
| 2139 | 739 |
| 740 conf = ngx_http_get_module_loc_conf(r, ngx_http_xslt_filter_module); | |
| 741 sheet = conf->sheets.elts; | |
| 742 doc = ctx->doc; | |
| 743 | |
| 744 /* preallocate array for 4 params */ | |
| 745 | |
| 746 if (ngx_array_init(&ctx->params, r->pool, 4 * 2 + 1, sizeof(char *)) | |
| 747 != NGX_OK) | |
| 748 { | |
| 749 xmlFreeDoc(doc); | |
| 750 return NULL; | |
| 751 } | |
| 752 | |
| 753 for (i = 0; i < conf->sheets.nelts; i++) { | |
| 754 | |
| 755 if (ngx_http_xslt_params(r, ctx, &sheet[i].params) != NGX_OK) { | |
| 756 xmlFreeDoc(doc); | |
| 757 return NULL; | |
| 758 } | |
| 759 | |
| 760 res = xsltApplyStylesheet(sheet[i].stylesheet, doc, ctx->params.elts); | |
| 761 | |
| 762 xmlFreeDoc(doc); | |
| 763 | |
| 764 if (res == NULL) { | |
| 765 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 766 "xsltApplyStylesheet() failed"); | |
| 767 return NULL; | |
| 768 } | |
| 769 | |
| 770 doc = res; | |
| 771 | |
| 772 /* reset array elements */ | |
| 773 ctx->params.nelts = 0; | |
| 774 } | |
| 775 | |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
776 /* there must be at least one stylesheet */ |
| 2139 | 777 |
|
2159
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
778 if (r == r->main) { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
779 type = ngx_http_xslt_content_type(sheet[i - 1].stylesheet); |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
780 |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
781 } else { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
782 type = NULL; |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
783 } |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
784 |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
785 encoding = ngx_http_xslt_encoding(sheet[i - 1].stylesheet); |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
786 doc_type = doc->type; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
787 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
788 ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
789 "xslt filter type: %d t:%s e:%s", |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
790 doc_type, type ? type : (u_char *) "(null)", |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
791 encoding ? encoding : (u_char *) "(null)"); |
| 2139 | 792 |
| 793 rc = xsltSaveResultToString(&buf, &len, doc, sheet[i - 1].stylesheet); | |
| 794 | |
| 795 xmlFreeDoc(doc); | |
| 796 | |
| 797 if (rc != 0) { | |
| 798 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 799 "xsltSaveResultToString() failed"); | |
| 800 return NULL; | |
| 801 } | |
| 802 | |
| 803 if (len == 0) { | |
| 804 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 805 "xsltSaveResultToString() returned zero-length result"); | |
| 806 return NULL; | |
| 807 } | |
| 808 | |
| 809 b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)); | |
| 810 if (b == NULL) { | |
| 811 ngx_free(buf); | |
| 812 return NULL; | |
| 813 } | |
| 814 | |
| 815 b->pos = buf; | |
| 816 b->last = buf + len; | |
| 817 b->memory = 1; | |
| 818 | |
|
2159
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
819 if (encoding) { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
820 r->headers_out.charset.len = ngx_strlen(encoding); |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
821 r->headers_out.charset.data = encoding; |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
822 } |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
823 |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
824 if (r != r->main) { |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
825 return b; |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
826 } |
|
0ec936b0010a
clear Last-Modified; set content-type and length for main request only
Igor Sysoev <igor@sysoev.ru>
parents:
2158
diff
changeset
|
827 |
|
2899
61d5b945730a
fix XSLT filter in SSI subrequests
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
828 b->last_buf = 1; |
|
61d5b945730a
fix XSLT filter in SSI subrequests
Igor Sysoev <igor@sysoev.ru>
parents:
2882
diff
changeset
|
829 |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
830 if (type) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
831 len = ngx_strlen(type); |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
832 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
833 r->headers_out.content_type_len = len; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
834 r->headers_out.content_type.len = len; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
835 r->headers_out.content_type.data = type; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
836 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
837 } else if (doc_type == XML_HTML_DOCUMENT_NODE) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
838 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
839 r->headers_out.content_type_len = sizeof("text/html") - 1; |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3508
diff
changeset
|
840 ngx_str_set(&r->headers_out.content_type, "text/html"); |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
841 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
842 |
|
2882
896db5a09bd2
reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents:
2821
diff
changeset
|
843 r->headers_out.content_type_lowcase = NULL; |
|
896db5a09bd2
reset content_type hash value, this fixes a bug when XSLT responses
Igor Sysoev <igor@sysoev.ru>
parents:
2821
diff
changeset
|
844 |
| 2139 | 845 return b; |
| 846 } | |
| 847 | |
| 848 | |
| 849 static ngx_int_t | |
| 850 ngx_http_xslt_params(ngx_http_request_t *r, ngx_http_xslt_filter_ctx_t *ctx, | |
| 851 ngx_array_t *params) | |
| 852 { | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
853 u_char *p, *last, *value, *dst, *src, **s; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
854 size_t len; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
855 ngx_uint_t i; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
856 ngx_str_t string; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
857 ngx_http_complex_value_t *param; |
| 2139 | 858 |
| 859 param = params->elts; | |
| 860 | |
| 861 for (i = 0; i < params->nelts; i++) { | |
| 862 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
863 if (ngx_http_complex_value(r, ¶m[i], &string) != NGX_OK) { |
| 2139 | 864 return NGX_ERROR; |
| 865 } | |
| 866 | |
| 867 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 868 "xslt filter param: \"%s\"", string.data); | |
| 869 | |
| 870 p = string.data; | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
871 last = string.data + string.len - 1; |
| 2139 | 872 |
| 873 while (p && *p) { | |
| 874 | |
| 875 value = p; | |
| 876 p = (u_char *) ngx_strchr(p, '='); | |
| 877 if (p == NULL) { | |
| 878 ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, | |
| 879 "invalid libxslt parameter \"%s\"", value); | |
| 880 return NGX_ERROR; | |
| 881 } | |
| 882 *p++ = '\0'; | |
| 883 | |
| 884 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 885 "xslt filter param name: \"%s\"", value); | |
| 886 | |
| 887 s = ngx_array_push(&ctx->params); | |
| 888 if (s == NULL) { | |
| 889 return NGX_ERROR; | |
| 890 } | |
| 891 | |
| 892 *s = value; | |
| 893 | |
| 894 value = p; | |
| 895 p = (u_char *) ngx_strchr(p, ':'); | |
| 896 | |
| 897 if (p) { | |
| 898 len = p - value; | |
| 899 *p++ = '\0'; | |
| 900 | |
| 901 } else { | |
| 902 len = last - value; | |
| 903 } | |
| 904 | |
| 905 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 906 "xslt filter param value: \"%s\"", value); | |
| 907 | |
| 908 dst = value; | |
| 909 src = value; | |
| 910 | |
| 911 ngx_unescape_uri(&dst, &src, len, 0); | |
| 912 | |
| 913 *dst = '\0'; | |
| 914 | |
| 915 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 916 "xslt filter param unescaped: \"%s\"", value); | |
| 917 | |
| 918 s = ngx_array_push(&ctx->params); | |
| 919 if (s == NULL) { | |
| 920 return NGX_ERROR; | |
| 921 } | |
| 922 | |
| 923 *s = value; | |
| 924 } | |
| 925 } | |
| 926 | |
| 927 s = ngx_array_push(&ctx->params); | |
| 928 if (s == NULL) { | |
| 929 return NGX_ERROR; | |
| 930 } | |
| 931 | |
| 932 *s = NULL; | |
| 933 | |
| 934 return NGX_OK; | |
| 935 } | |
| 936 | |
| 937 | |
|
2153
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
938 static u_char * |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
939 ngx_http_xslt_content_type(xsltStylesheetPtr s) |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
940 { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
941 u_char *type; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
942 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
943 if (s->mediaType) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
944 return s->mediaType; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
945 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
946 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
947 for (s = s->imports; s; s = s->next) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
948 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
949 type = ngx_http_xslt_content_type(s); |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
950 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
951 if (type) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
952 return type; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
953 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
954 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
955 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
956 return NULL; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
957 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
958 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
959 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
960 static u_char * |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
961 ngx_http_xslt_encoding(xsltStylesheetPtr s) |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
962 { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
963 u_char *encoding; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
964 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
965 if (s->encoding) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
966 return s->encoding; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
967 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
968 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
969 for (s = s->imports; s; s = s->next) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
970 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
971 encoding = ngx_http_xslt_encoding(s); |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
972 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
973 if (encoding) { |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
974 return encoding; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
975 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
976 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
977 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
978 return NULL; |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
979 } |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
980 |
|
6476e445d6ce
xsl:output's media-type and encoding support
Igor Sysoev <igor@sysoev.ru>
parents:
2152
diff
changeset
|
981 |
| 2139 | 982 static void |
| 983 ngx_http_xslt_cleanup(void *data) | |
| 984 { | |
| 985 ngx_free(data); | |
| 986 } | |
| 987 | |
| 988 | |
| 989 static char * | |
| 990 ngx_http_xslt_entities(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 991 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
992 ngx_http_xslt_filter_loc_conf_t *xlcf = conf; |
| 2139 | 993 |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
994 ngx_str_t *value; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
995 ngx_uint_t i; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
996 ngx_pool_cleanup_t *cln; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
997 ngx_http_xslt_file_t *file; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
998 ngx_http_xslt_filter_main_conf_t *xmcf; |
| 2139 | 999 |
| 1000 if (xlcf->dtd) { | |
| 1001 return "is duplicate"; | |
| 1002 } | |
| 1003 | |
| 1004 value = cf->args->elts; | |
| 1005 | |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1006 xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module); |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1007 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1008 file = xmcf->dtd_files.elts; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1009 for (i = 0; i < xmcf->dtd_files.nelts; i++) { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1010 if (ngx_strcmp(file[i].name, &value[1].data) == 0) { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1011 xlcf->dtd = file[i].data; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1012 return NGX_CONF_OK; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1013 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1014 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1015 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1016 cln = ngx_pool_cleanup_add(cf->pool, 0); |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1017 if (cln == NULL) { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1018 return NGX_CONF_ERROR; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1019 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1020 |
| 2139 | 1021 xlcf->dtd = xmlParseDTD(NULL, (xmlChar *) value[1].data); |
| 1022 | |
| 1023 if (xlcf->dtd == NULL) { | |
| 1024 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, "xmlParseDTD() failed"); | |
| 1025 return NGX_CONF_ERROR; | |
| 1026 } | |
| 1027 | |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1028 cln->handler = ngx_http_xslt_cleanup_dtd; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1029 cln->data = xlcf->dtd; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1030 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1031 file = ngx_array_push(&xmcf->dtd_files); |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1032 if (file == NULL) { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1033 return NGX_CONF_ERROR; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1034 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1035 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1036 file->name = value[1].data; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1037 file->data = xlcf->dtd; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1038 |
| 2139 | 1039 return NGX_CONF_OK; |
| 1040 } | |
| 1041 | |
| 1042 | |
| 1043 | |
| 1044 static char * | |
| 1045 ngx_http_xslt_stylesheet(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1046 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1047 ngx_http_xslt_filter_loc_conf_t *xlcf = conf; |
| 2139 | 1048 |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1049 ngx_str_t *value; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1050 ngx_uint_t i, n; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1051 ngx_pool_cleanup_t *cln; |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1052 ngx_http_xslt_file_t *file; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1053 ngx_http_xslt_sheet_t *sheet; |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1054 ngx_http_complex_value_t *param; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1055 ngx_http_compile_complex_value_t ccv; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1056 ngx_http_xslt_filter_main_conf_t *xmcf; |
| 2139 | 1057 |
| 1058 value = cf->args->elts; | |
| 1059 | |
| 1060 if (xlcf->sheets.elts == NULL) { | |
| 1061 if (ngx_array_init(&xlcf->sheets, cf->pool, 1, | |
| 1062 sizeof(ngx_http_xslt_sheet_t)) | |
| 1063 != NGX_OK) | |
| 1064 { | |
| 1065 return NGX_CONF_ERROR; | |
| 1066 } | |
| 1067 } | |
| 1068 | |
| 1069 sheet = ngx_array_push(&xlcf->sheets); | |
| 1070 if (sheet == NULL) { | |
| 1071 return NGX_CONF_ERROR; | |
| 1072 } | |
| 1073 | |
| 1074 ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t)); | |
| 1075 | |
| 1076 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) { | |
| 1077 return NGX_CONF_ERROR; | |
| 1078 } | |
| 1079 | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1080 xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module); |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1081 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1082 file = xmcf->sheet_files.elts; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1083 for (i = 0; i < xmcf->sheet_files.nelts; i++) { |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1084 if (ngx_strcmp(file[i].name, &value[1].data) == 0) { |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1085 sheet->stylesheet = file[i].data; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1086 goto found; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1087 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1088 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1089 |
| 2139 | 1090 cln = ngx_pool_cleanup_add(cf->pool, 0); |
| 1091 if (cln == NULL) { | |
| 1092 return NGX_CONF_ERROR; | |
| 1093 } | |
| 1094 | |
| 1095 sheet->stylesheet = xsltParseStylesheetFile(value[1].data); | |
| 1096 if (sheet->stylesheet == NULL) { | |
| 1097 ngx_conf_log_error(NGX_LOG_ERR, cf, 0, | |
| 1098 "xsltParseStylesheetFile(\"%s\") failed", | |
| 1099 value[1].data); | |
| 1100 return NGX_CONF_ERROR; | |
| 1101 } | |
| 1102 | |
| 1103 cln->handler = ngx_http_xslt_cleanup_stylesheet; | |
| 1104 cln->data = sheet->stylesheet; | |
| 1105 | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1106 file = ngx_array_push(&xmcf->sheet_files); |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1107 if (file == NULL) { |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1108 return NGX_CONF_ERROR; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1109 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1110 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1111 file->name = value[1].data; |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1112 file->data = sheet->stylesheet; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1113 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1114 found: |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1115 |
| 2139 | 1116 n = cf->args->nelts; |
| 1117 | |
| 1118 if (n == 2) { | |
| 1119 return NGX_CONF_OK; | |
| 1120 } | |
| 1121 | |
| 1122 if (ngx_array_init(&sheet->params, cf->pool, n - 2, | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1123 sizeof(ngx_http_complex_value_t)) |
| 2139 | 1124 != NGX_OK) |
| 1125 { | |
| 1126 return NGX_CONF_ERROR; | |
| 1127 } | |
| 1128 | |
| 1129 for (i = 2; i < n; i++) { | |
| 1130 | |
| 1131 param = ngx_array_push(&sheet->params); | |
| 1132 if (param == NULL) { | |
| 1133 return NGX_CONF_ERROR; | |
| 1134 } | |
| 1135 | |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1136 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
| 2139 | 1137 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1138 ccv.cf = cf; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1139 ccv.value = &value[i]; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1140 ccv.complex_value = param; |
|
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1141 ccv.zero = 1; |
| 2139 | 1142 |
|
2588
a6954ce88b80
use complex values in add_header, auth_basic_user_file,
Igor Sysoev <igor@sysoev.ru>
parents:
2299
diff
changeset
|
1143 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
| 2139 | 1144 return NGX_CONF_ERROR; |
| 1145 } | |
| 1146 } | |
| 1147 | |
| 1148 return NGX_CONF_OK; | |
| 1149 } | |
| 1150 | |
| 1151 | |
| 1152 static void | |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1153 ngx_http_xslt_cleanup_dtd(void *data) |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1154 { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1155 xmlFreeDtd(data); |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1156 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1157 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1158 |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1159 static void |
| 2139 | 1160 ngx_http_xslt_cleanup_stylesheet(void *data) |
| 1161 { | |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1162 xsltFreeStylesheet(data); |
| 2139 | 1163 } |
| 1164 | |
| 1165 | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1166 static void * |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1167 ngx_http_xslt_filter_create_main_conf(ngx_conf_t *cf) |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1168 { |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1169 ngx_http_xslt_filter_main_conf_t *conf; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1170 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1171 conf = ngx_palloc(cf->pool, sizeof(ngx_http_xslt_filter_main_conf_t)); |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1172 if (conf == NULL) { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2899
diff
changeset
|
1173 return NULL; |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1174 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1175 |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1176 if (ngx_array_init(&conf->dtd_files, cf->pool, 1, |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1177 sizeof(ngx_http_xslt_file_t)) |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1178 != NGX_OK) |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1179 { |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1180 return NULL; |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1181 } |
|
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1182 |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1183 if (ngx_array_init(&conf->sheet_files, cf->pool, 1, |
|
2156
0c6d0bd60579
reuse compiled DTD hash in different locations, add DTD cleanup
Igor Sysoev <igor@sysoev.ru>
parents:
2154
diff
changeset
|
1184 sizeof(ngx_http_xslt_file_t)) |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1185 != NGX_OK) |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1186 { |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1187 return NULL; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1188 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1189 |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1190 return conf; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1191 } |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1192 |
| 2139 | 1193 |
| 1194 static void * | |
| 1195 ngx_http_xslt_filter_create_conf(ngx_conf_t *cf) | |
| 1196 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1197 ngx_http_xslt_filter_loc_conf_t *conf; |
| 2139 | 1198 |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1199 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_xslt_filter_loc_conf_t)); |
| 2139 | 1200 if (conf == NULL) { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2899
diff
changeset
|
1201 return NULL; |
| 2139 | 1202 } |
| 1203 | |
| 1204 /* | |
| 1205 * set by ngx_pcalloc(): | |
| 1206 * | |
| 2148 | 1207 * conf->dtd = NULL; |
| 1208 * conf->sheets = { NULL }; | |
| 1209 * conf->types = { NULL }; | |
| 1210 * conf->types_keys = NULL; | |
| 2139 | 1211 */ |
| 1212 | |
| 1213 return conf; | |
| 1214 } | |
| 1215 | |
| 1216 | |
| 1217 static char * | |
| 1218 ngx_http_xslt_filter_merge_conf(ngx_conf_t *cf, void *parent, void *child) | |
| 1219 { | |
|
2154
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1220 ngx_http_xslt_filter_loc_conf_t *prev = parent; |
|
4f48a2765da0
reuse compiled XSLT tree in different locations
Igor Sysoev <igor@sysoev.ru>
parents:
2153
diff
changeset
|
1221 ngx_http_xslt_filter_loc_conf_t *conf = child; |
| 2139 | 1222 |
| 1223 if (conf->dtd == NULL) { | |
| 1224 conf->dtd = prev->dtd; | |
| 1225 } | |
| 1226 | |
| 1227 if (conf->sheets.nelts == 0) { | |
| 1228 conf->sheets = prev->sheets; | |
| 1229 } | |
| 1230 | |
|
3372
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
1231 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
|
6b8e5c882e47
support "*" in gzip_types, ssi_types, etc
Igor Sysoev <igor@sysoev.ru>
parents:
3115
diff
changeset
|
1232 &prev->types_keys, &prev->types, |
| 2148 | 1233 ngx_http_xslt_default_types) |
| 2139 | 1234 != NGX_OK) |
| 1235 { | |
| 1236 return NGX_CONF_ERROR; | |
| 1237 } | |
| 1238 | |
| 1239 return NGX_CONF_OK; | |
| 1240 } | |
| 1241 | |
| 1242 | |
| 1243 static ngx_int_t | |
| 1244 ngx_http_xslt_filter_init(ngx_conf_t *cf) | |
| 1245 { | |
| 1246 xmlInitParser(); | |
| 1247 | |
| 2299 | 1248 #if (NGX_HAVE_EXSLT) |
| 1249 exsltRegisterAll(); | |
| 1250 #endif | |
| 1251 | |
| 2139 | 1252 ngx_http_next_header_filter = ngx_http_top_header_filter; |
| 1253 ngx_http_top_header_filter = ngx_http_xslt_header_filter; | |
| 1254 | |
| 1255 ngx_http_next_body_filter = ngx_http_top_body_filter; | |
| 1256 ngx_http_top_body_filter = ngx_http_xslt_body_filter; | |
| 1257 | |
| 1258 return NGX_OK; | |
| 1259 } | |
| 1260 | |
| 1261 | |
| 1262 static void | |
| 1263 ngx_http_xslt_filter_exit(ngx_cycle_t *cycle) | |
| 1264 { | |
| 1265 xsltCleanupGlobals(); | |
| 1266 xmlCleanupParser(); | |
| 1267 } |