summaryrefslogtreecommitdiffhomepage
path: root/src/http/modules/ngx_http_proxy_module.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2012-03-05 13:26:40 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2012-03-05 13:26:40 +0000
commitfc03bdde05ef82c3e215a0a0d41a1e88419996df (patch)
treec71ad4e462bd1d712d88644cbe4442c03de2d068 /src/http/modules/ngx_http_proxy_module.c
parent1b6a7864a1777b070851fead7626fb21862932b3 (diff)
downloadnginx-fc03bdde05ef82c3e215a0a0d41a1e88419996df.tar.gz
nginx-fc03bdde05ef82c3e215a0a0d41a1e88419996df.tar.bz2
Merge of r4500: fixed spelling in single-line comments.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
-rw-r--r--src/http/modules/ngx_http_proxy_module.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 26626ee57..6bb30db4d 100644
--- 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_module_ctx = {
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 */
};