Merge format_values

dedok · dedok · commit 1e940a7c5da5 · 2017-12-19T11:51:26.000+03:00
diff --git a/src/ngx_http_tnt_module.c b/src/ngx_http_tnt_module.c
@@ -886,6 +886,10 @@ ngx_http_tnt_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->allowed_indexes = prev->allowed_indexes;
     }
 
+    if (conf->format_values == NULL) {
+        conf->format_values = prev->format_values;
+    }
+
     return NGX_CONF_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -886,6 +886,10 @@ ngx_http_tnt_merge_loc_conf(ngx_conf_t cf, void parent, void *child)`
`886`	`886`	`conf->allowed_indexes = prev->allowed_indexes;`
`887`	`887`	`}`
`888`	`888`
	`889`	`+ if (conf->format_values == NULL) {`
	`890`	`+ conf->format_values = prev->format_values;`
	`891`	`+ }`
	`892`	`+`
`889`	`893`	`return NGX_CONF_OK;`
`890`	`894`	`}`
`891`	`895`