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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 03:00:55 +0000 (Sun, 10 Feb 2013)
New Revision: 5040
URL: http://trac.nginx.org/nginx/changeset/5040/nginx

Log:
Merge of r4947: xslt: prevented infinite loop.

If XSLT transformation failed and error 500 was handled in the same
location, an infinite loop occured that exhausted the stack.


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	2013-02-10 02:58:03 UTC (rev 5039)
+++ branches/stable-1.2	2013-02-10 03:00:55 UTC (rev 5040)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4946,4978,4984
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4947,4978,4984
\ 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	2013-02-10 02:58:03 UTC (rev 5039)
+++ branches/stable-1.2/src/http/modules/ngx_http_xslt_filter_module.c	2013-02-10 03:00:55 UTC (rev 5040)
@@ -307,7 +307,7 @@
     ctx->done = 1;
 
     if (b == NULL) {
-        return ngx_http_filter_finalize_request(r, NULL,
+        return ngx_http_filter_finalize_request(r, &ngx_http_xslt_filter_module,
                                                NGX_HTTP_INTERNAL_SERVER_ERROR);
     }
 
@@ -315,7 +315,7 @@
 
     if (cln == NULL) {
         ngx_free(b->pos);
-        return ngx_http_filter_finalize_request(r, NULL,
+        return ngx_http_filter_finalize_request(r, &ngx_http_xslt_filter_module,
                                                NGX_HTTP_INTERNAL_SERVER_ERROR);
     }