fix merge

Chrono Law · Chrono Law · commit a3be417516e6 · 2015-11-24T16:29:12.000+08:00
diff --git a/modules/subrequest/NdgSubrequestConf.hpp b/modules/subrequest/NdgSubrequestConf.hpp
@@ -28,8 +28,8 @@ class NdgSubrequestConf final
         auto prev = reinterpret_cast<this_type*>(parent);
         auto conf = reinterpret_cast<this_type*>(child);
 
-        NgxValue::merge(conf->loc, prev->loc, ngx_string("/echo"));
-        NgxValue::merge(conf->args, prev->args, ngx_null_string);
+        NgxValue::merge(conf->loc, prev->loc, ngx_str_t ngx_string("/echo"));
+        NgxValue::merge(conf->args, prev->args, ngx_str_t ngx_null_string);
 
         return NGX_CONF_OK;
     }

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ class NdgSubrequestConf final`
`28`	`28`	`auto prev = reinterpret_cast<this_type*>(parent);`
`29`	`29`	`auto conf = reinterpret_cast<this_type*>(child);`
`30`	`30`
`31`		`- NgxValue::merge(conf->loc, prev->loc, ngx_string("/echo"));`
`32`		`- NgxValue::merge(conf->args, prev->args, ngx_null_string);`
	`31`	`+ NgxValue::merge(conf->loc, prev->loc, ngx_str_t ngx_string("/echo"));`
	`32`	`+ NgxValue::merge(conf->args, prev->args, ngx_str_t ngx_null_string);`
`33`	`33`
`34`	`34`	`return NGX_CONF_OK;`
`35`	`35`	`}`