Ticket #59: nginx-1.1.8-xslt-fix.patch

src/http/modules/ngx_http_xslt_filter_module.c

@@ -40 +40 @@
 typedef struct {
     xsltStylesheetPtr    stylesheet;
     ngx_array_t          params;       /* ngx_http_complex_value_t */
+    ngx_str_t            name;
 } ngx_http_xslt_sheet_t;
 
 
@@ -90 +91 @@
 static void *ngx_http_xslt_filter_create_conf(ngx_conf_t *cf);
 static char *ngx_http_xslt_filter_merge_conf(ngx_conf_t *cf, void *parent,
     void *child);
+    static ngx_int_t ngx_http_xslt_filter_preinit(ngx_conf_t *cf);
 static ngx_int_t ngx_http_xslt_filter_init(ngx_conf_t *cf);
 static void ngx_http_xslt_filter_exit(ngx_cycle_t *cycle);
 
-
 ngx_str_t  ngx_http_xslt_default_types[] = {
     ngx_string("text/xml"),
     ngx_null_string
@@ -128 +129 @@
 
 
 static ngx_http_module_t  ngx_http_xslt_filter_module_ctx = {
-    NULL,                                  /* preconfiguration */
+    ngx_http_xslt_filter_preinit,          /* preconfiguration */
     ngx_http_xslt_filter_init,             /* postconfiguration */
 
     ngx_http_xslt_filter_create_main_conf, /* create main configuration */
@@ -764 +765 @@
 
     ngx_str_t                         *value;
     ngx_uint_t                         i, n;
-    ngx_pool_cleanup_t                *cln;
-    ngx_http_xslt_file_t              *file;
     ngx_http_xslt_sheet_t             *sheet;
     ngx_http_complex_value_t          *param;
     ngx_http_compile_complex_value_t   ccv;
-    ngx_http_xslt_filter_main_conf_t  *xmcf;
 
     value = cf->args->elts;
 
@@ -789 +787 @@
 
     ngx_memzero(sheet, sizeof(ngx_http_xslt_sheet_t));
 
-    if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) {
-        return NGX_CONF_ERROR;
-    }
-
-    xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module);
-
-    file = xmcf->sheet_files.elts;
-    for (i = 0; i < xmcf->sheet_files.nelts; i++) {
-        if (ngx_strcmp(file[i].name, &value[1].data) == 0) {
-            sheet->stylesheet = file[i].data;
-            goto found;
-        }
-    }
-
-    cln = ngx_pool_cleanup_add(cf->pool, 0);
-    if (cln == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    sheet->stylesheet = xsltParseStylesheetFile(value[1].data);
-    if (sheet->stylesheet == NULL) {
-        ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
-                           "xsltParseStylesheetFile(\"%s\") failed",
-                           value[1].data);
-        return NGX_CONF_ERROR;
-    }
-
-    cln->handler = ngx_http_xslt_cleanup_stylesheet;
-    cln->data = sheet->stylesheet;
-
-    file = ngx_array_push(&xmcf->sheet_files);
-    if (file == NULL) {
-        return NGX_CONF_ERROR;
-    }
-
-    file->name = value[1].data;
-    file->data = sheet->stylesheet;
-
-found:
+    sheet->name.len  = value[1].len;
+    sheet->name.data = value[1].data;
 
     n = cf->args->nelts;
 
@@ -935 +896 @@
 {
     ngx_http_xslt_filter_loc_conf_t *prev = parent;
     ngx_http_xslt_filter_loc_conf_t *conf = child;
+    ngx_http_xslt_sheet_t *sheet = NULL;
+    ngx_http_xslt_filter_main_conf_t *xmcf = NULL;
+    ngx_http_core_loc_conf_t *clcf = NULL;
+
+    xmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_xslt_filter_module);
+    clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
 
     if (conf->dtd == NULL) {
         conf->dtd = prev->dtd;
@@ -943 +910 @@
     if (conf->sheets.nelts == 0) {
         conf->sheets = prev->sheets;
     }
+    else
+    {
+        ngx_uint_t i = 0, ii = 0;
+        ngx_http_xslt_file_t *file = NULL;
+
+        sheet = conf->sheets.elts;
+        for (i = 0; i < conf->sheets.nelts; i++)
+        {
+            if(sheet[i].name.len
+                 && !(sheet[i].name.data[0] == '/'
+                     || (sheet[i].name.data[0] != '.' && sheet[i].name.data[1] != '/')
+                     || (sheet[i].name.data[0] != '.' && sheet[i].name.data[1] != '.'
+                         && sheet[i].name.data[2] != '/'))
+                 && clcf->root.len) {
+
+                 u_char *s = sheet[i].name.data;
+
+                 sheet[i].name.data = ngx_pcalloc(cf->pool, sheet[i].name.len + 1 + clcf->root.len + 1);
+                 if(sheet[i].name.data == NULL) {
+                     return NGX_CONF_ERROR;
+                 }
+
+                 ngx_sprintf(sheet[i].name.data, "%s/%s", clcf->root.data, s);
+            } else if (ngx_conf_full_name(cf->cycle, &sheet[i].name, 0) != NGX_OK) {
+                 return NGX_CONF_ERROR;
+            }
+
+            file = xmcf->sheet_files.elts;
+            for (ii = 0; ii < xmcf->sheet_files.nelts; ii++)
+            {
+                if (ngx_strcmp(file[ii].name, sheet[i].name.data) == 0)
+                {
+                     sheet[i].stylesheet = file[ii].data;
+                }
+            }
+
+            if(!sheet[i].stylesheet)
+            {
+                ngx_pool_cleanup_t *cln = NULL;
+
+                cln = ngx_pool_cleanup_add(cf->pool, 0);
+                if (cln == NULL) {
+                     return NGX_CONF_ERROR;
+                }
+
+                sheet[i].stylesheet = xsltParseStylesheetFile(sheet[i].name.data);
+                if (sheet[i].stylesheet == NULL) {
+                     ngx_conf_log_error(NGX_LOG_ERR, cf, 0,
+                                        "xsltParseStylesheetFile(\"%s\") failed",
+                                        sheet[i].name.data);
+                      return NGX_CONF_ERROR;
+                 }
+
+                 cln->handler = ngx_http_xslt_cleanup_stylesheet;
+                 cln->data = sheet[i].stylesheet;
+
+                 file = ngx_array_push(&xmcf->sheet_files);
+                 if (file == NULL) {
+                     return NGX_CONF_ERROR;
+                 }
+
+                 file->name = sheet[i].name.data;
+                 file->data = sheet[i].stylesheet;
+            }
+        }
+    }
 
     if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
                              &prev->types_keys, &prev->types,
@@ -952 +985 @@
         return NGX_CONF_ERROR;
     }
 
+
     return NGX_CONF_OK;
 }
 
-
 static ngx_int_t
-ngx_http_xslt_filter_init(ngx_conf_t *cf)
+ngx_http_xslt_filter_preinit(ngx_conf_t *cf)
 {
+    /* ensure init before actualy using libXML */
     xmlInitParser();
 
 #if (NGX_HAVE_EXSLT)
     exsltRegisterAll();
 #endif
 
+    return NGX_OK;
+}
+
+static ngx_int_t
+ngx_http_xslt_filter_init(ngx_conf_t *cf)
+{
     ngx_http_next_header_filter = ngx_http_top_header_filter;
     ngx_http_top_header_filter = ngx_http_xslt_header_filter;
 
@@ -974 +1014 @@
     return NGX_OK;
 }
 
-
 static void
 ngx_http_xslt_filter_exit(ngx_cycle_t *cycle)
 {