Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 4805:655a4ef244fa stable-1.2
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 06 Aug 2012 17:36:30 +0000 |
parents | 179a4d4073b3 |
children | c3b276283e4a |
comparison
equal
deleted
inserted
replaced
4804:56fcb5767f06 | 4805:655a4ef244fa |
---|---|
1821 } | 1821 } |
1822 } | 1822 } |
1823 | 1823 |
1824 #endif | 1824 #endif |
1825 | 1825 |
1826 return NGX_OK; | 1826 return NGX_DECLINED; |
1827 | 1827 |
1828 found: | 1828 found: |
1829 | 1829 |
1830 r->srv_conf = cscf->ctx->srv_conf; | 1830 r->srv_conf = cscf->ctx->srv_conf; |
1831 r->loc_conf = cscf->ctx->loc_conf; | 1831 r->loc_conf = cscf->ctx->loc_conf; |