ext/nginx/MergeLocationConfig.c in passenger-4.0.19 vs ext/nginx/MergeLocationConfig.c in passenger-4.0.20

- old
+ new

@@ -146,9 +146,15 @@ prev->spawn_method, NULL); + ngx_conf_merge_value(conf->load_shell_envvars, + prev->load_shell_envvars, + NGX_CONF_UNSET); + + + ngx_conf_merge_str_value(conf->union_station_key, prev->union_station_key, NULL);