nginx-0.3.33-RELEASE import
*) 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.
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 62f3655..a183a57 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -282,7 +282,7 @@
#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 { \
