[nginx] svn commit: r4718 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-07-02 15:39:28 +0000 (Mon, 02 Jul 2012)
New Revision: 4718
URL: http://trac.nginx.org/nginx/changeset/4718/nginx

Log:
Merge of r4647: xslt reuse.

Fixed the reuse of parsed DTDs and XSLTs.

Patch by Kuramoto Eiji.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_xslt_filter_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-07-02 15:37:49 UTC (rev 4717)
+++ branches/stable-1.2	2012-07-02 15:39:28 UTC (rev 4718)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4646,4674-4676
+/trunk:4611-4632,4636-4647,4674-4676
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_xslt_filter_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_xslt_filter_module.c	2012-07-02 15:37:49 UTC (rev 4717)
+++ branches/stable-1.2/src/http/modules/ngx_http_xslt_filter_module.c	2012-07-02 15:39:28 UTC (rev 4718)
@@ -810,7 +810,7 @@
 
     file = xmcf->dtd_files.elts;
     for (i = 0; i < xmcf->dtd_files.nelts; i++) {
-        if (ngx_strcmp(file[i].name, &value[1].data) == 0) {
+        if (ngx_strcmp(file[i].name, value[1].data) == 0) {
             xlcf->dtd = file[i].data;
             return NGX_CONF_OK;
         }
@@ -884,7 +884,7 @@
 
     file = xmcf->sheet_files.elts;
     for (i = 0; i < xmcf->sheet_files.nelts; i++) {
-        if (ngx_strcmp(file[i].name, &value[1].data) == 0) {
+        if (ngx_strcmp(file[i].name, value[1].data) == 0) {
             sheet->stylesheet = file[i].data;
             goto found;
         }