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

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
comparison
equal deleted inserted replaced
4516:b927410d9638 4517:50143b8fb95f
456 NULL, /* init main configuration */ 456 NULL, /* init main configuration */
457 457
458 NULL, /* create server configuration */ 458 NULL, /* create server configuration */
459 NULL, /* merge server configuration */ 459 NULL, /* merge server configuration */
460 460
461 ngx_http_proxy_create_loc_conf, /* create location configration */ 461 ngx_http_proxy_create_loc_conf, /* create location configuration */
462 ngx_http_proxy_merge_loc_conf /* merge location configration */ 462 ngx_http_proxy_merge_loc_conf /* merge location configuration */
463 }; 463 };
464 464
465 465
466 ngx_module_t ngx_http_proxy_module = { 466 ngx_module_t ngx_http_proxy_module = {
467 NGX_MODULE_V1, 467 NGX_MODULE_V1,