Mercurial > hg > nginx-vendor-current

diff src/core/ngx_conf_file.h @ 172:1b490fc19afa NGINX_0_3_33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.33 *) Feature: the "http_503" parameter of the "proxy_next_upstream" or "fastcgi_next_upstream" directives. *) Bugfix: ngx_http_perl_module did not work with inlined in the configuration code, if it was not started with the "sub" word. *) Bugfix: in the "post_action" directive.
author Igor Sysoev <http://sysoev.ru>
date Wed, 15 Mar 2006 00:00:00 +0300
parents 84910468f6de
children 003bd800ec2a
line wrap: on
line diff
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -282,7 +282,7 @@ char *ngx_conf_check_num_bounds(ngx_conf
 
 #define ngx_conf_merge_str_value(conf, prev, default)                        \
     if (conf.data == NULL) {                                                 \
-        if (prev.data) {                                                      \
+        if (prev.data) {                                                     \
             conf.len = prev.len;                                             \
             conf.data = prev.data;                                           \
         } else {                                                             \