diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 10:18:41 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 10:18:41 +0000 |
| commit | b5f5da3a37f2169d6745f7160203a792ab49cac0 (patch) | |
| tree | 5c43c5c64900ac6279859f20aad437a74bb1aca7 /src/http/ngx_http_core_module.c | |
| parent | 6ea25ac7e7df387aa9ef1dee4187da21c2d86888 (diff) | |
| download | nginx-b5f5da3a37f2169d6745f7160203a792ab49cac0.tar.gz nginx-b5f5da3a37f2169d6745f7160203a792ab49cac0.tar.bz2 | |
r2007, r2025, r2042 merge:
style fixes
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index f57db3622..cb9eb14c7 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2922,7 +2922,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_ERROR; } } - + conf->resolver = prev->resolver; } |