Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 3470:b982f2dee8cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix proxy_redirect name in error message
author Igor Sysoev <igor@sysoev.ru>
date Wed, 10 Mar 2010 14:37:18 +0000
parents ac9c0380337d
children d8c56e7851b8
comparison
equal deleted inserted replaced
3469:08a66ba99191 3470:b982f2dee8cf
1911 * conf->headers_set = NULL; 1911 * conf->headers_set = NULL;
1912 * conf->headers_set_hash = NULL; 1912 * conf->headers_set_hash = NULL;
1913 * conf->body_set_len = NULL; 1913 * conf->body_set_len = NULL;
1914 * conf->body_set = NULL; 1914 * conf->body_set = NULL;
1915 * conf->body_source = { 0, NULL }; 1915 * conf->body_source = { 0, NULL };
1916 * conf->rewrite_locations = NULL; 1916 * conf->redirects = NULL;
1917 */ 1917 */
1918 1918
1919 conf->upstream.store = NGX_CONF_UNSET; 1919 conf->upstream.store = NGX_CONF_UNSET;
1920 conf->upstream.store_access = NGX_CONF_UNSET_UINT; 1920 conf->upstream.store_access = NGX_CONF_UNSET_UINT;
1921 conf->upstream.buffering = NGX_CONF_UNSET; 1921 conf->upstream.buffering = NGX_CONF_UNSET;
2754 } 2754 }
2755 2755
2756 if (ngx_strcmp(value[1].data, "default") == 0) { 2756 if (ngx_strcmp(value[1].data, "default") == 0) {
2757 if (plcf->url.data == NULL) { 2757 if (plcf->url.data == NULL) {
2758 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 2758 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
2759 "\"proxy_rewrite_location default\" must go " 2759 "\"proxy_redirect default\" must go "
2760 "after the \"proxy_pass\" directive"); 2760 "after the \"proxy_pass\" directive");
2761 return NGX_CONF_ERROR; 2761 return NGX_CONF_ERROR;
2762 } 2762 }
2763 2763
2764 pr->handler = ngx_http_proxy_rewrite_redirect_text; 2764 pr->handler = ngx_http_proxy_rewrite_redirect_text;