Mercurial > hg > nginx

diff src/http/modules/ngx_http_proxy_module.c @ 4517:50143b8fb95f stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4500: fixed spelling in single-line comments.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 05 Mar 2012 13:26:40 +0000
parents 7150b4325a25
children fb322541c548
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -458,8 +458,8 @@ static ngx_http_module_t  ngx_http_proxy
     NULL,                                  /* create server configuration */
     NULL,                                  /* merge server configuration */
 
-    ngx_http_proxy_create_loc_conf,        /* create location configration */
-    ngx_http_proxy_merge_loc_conf          /* merge location configration */
+    ngx_http_proxy_create_loc_conf,        /* create location configuration */
+    ngx_http_proxy_merge_loc_conf          /* merge location configuration */
 };