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

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-08-06 17:36:30 +0000 (Mon, 06 Aug 2012)
New Revision: 4806
URL: http://trac.nginx.org/nginx/changeset/4806/nginx

Log:
Merge of r4771: ngx_http_find_virtual_server() fix.

The ngx_http_find_virtual_server() function should return NGX_DECLINED
if virtual server not found.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_request.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-08-06 17:34:08 UTC (rev 4805)
+++ branches/stable-1.2	2012-08-06 17:36:30 UTC (rev 4806)

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-4738,4740-4741,4754,4756-4770
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4738,4740-4741,4754,4756-4771
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_request.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_request.c	2012-08-06 17:34:08 UTC (rev 4805)
+++ branches/stable-1.2/src/http/ngx_http_request.c	2012-08-06 17:36:30 UTC (rev 4806)
@@ -1823,7 +1823,7 @@
 
 #endif
 
-    return NGX_OK;
+    return NGX_DECLINED;
 
 found: