diff options
Diffstat (limited to 'src/core/ngx_conf_file.h')
| -rw-r--r-- | src/core/ngx_conf_file.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h index 0e94056af..8dcdd5455 100644 --- a/src/core/ngx_conf_file.h +++ b/src/core/ngx_conf_file.h @@ -239,8 +239,8 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data); } #define ngx_conf_merge_str_value(conf, prev, default) \ - if (conf.len == 0) { \ - if (prev.len) { \ + if (conf.data == NULL) { \ + if (prev.data) { \ conf.len = prev.len; \ conf.data = prev.data; \ } else { \ |