Author: mdounin
Date: 2013-02-11 13:52:13 +0000 (Mon, 11 Feb 2013)
New Revision: 5052
URL: http://trac.nginx.org/nginx/changeset/5052/nginx
Log:
Merge of r4976: let add_header affect 201 responses (ticket #125).
Modified:
branches/stable-1.2/
branches/stable-1.2/src/http/modules/ngx_http_headers_filter_module.c
Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2013-02-11 12:37:06 UTC (rev 5051)
+++ branches/stable-1.2 2013-02-11 13:52:13 UTC (rev 5052)
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-4949,4961-4969,4973-4974,4977-4978,4980-4981,4983-4984,4990,4993-4994,4997,5000,5011
+/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-4949,4961-4969,4973-4974,4976-4978,4980-4981,4983-4984,4990,4993-4994,4997,5000,5011
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_headers_filter_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_headers_filter_module.c 2013-02-11 12:37:06 UTC (rev 5051)
+++ branches/stable-1.2/src/http/modules/ngx_http_headers_filter_module.c 2013-02-11 13:52:13 UTC (rev 5052)
@@ -149,6 +149,7 @@
if ((conf->expires == NGX_HTTP_EXPIRES_OFF && conf->headers == NULL)
|| r != r->main
|| (r->headers_out.status != NGX_HTTP_OK
+ && r->headers_out.status != NGX_HTTP_CREATED
&& r->headers_out.status != NGX_HTTP_NO_CONTENT
&& r->headers_out.status != NGX_HTTP_PARTIAL_CONTENT
&& r->headers_out.status != NGX_HTTP_MOVED_PERMANENTLY
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
