src/nginx_module/ConfigGeneral/ManifestGeneration.h in passenger-5.2.1 vs src/nginx_module/ConfigGeneral/ManifestGeneration.h in passenger-5.2.2

- old
+ new

@@ -2,10 +2,11 @@ #define _PASSENGER_NGINX_MODULE_CONFIG_GENERAL_MANIFEST_GENERATION_H_ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_http.h> +#include "cxx_supportlib/FileTools/PathManipCBindings.h" #include "cxx_supportlib/JsonTools/CBindings.h" #ifndef _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_ #define _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_ struct passenger_main_conf_s; @@ -38,9 +39,11 @@ static void recursively_generate_config_manifest_for_loc_conf(manifest_gen_ctx_t *ctx, passenger_loc_conf_t *plcf); static int infer_loc_conf_app_group_name(manifest_gen_ctx_t *ctx, passenger_loc_conf_t *plcf, ngx_http_core_loc_conf_t *clcf, ngx_str_t *result); +static u_char *infer_default_app_root(manifest_gen_ctx_t *ctx, + ngx_http_core_loc_conf_t *clcf, size_t *len); static void generate_config_manifest_for_loc_conf(manifest_gen_ctx_t *ctx, passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf, ngx_http_core_loc_conf_t *clcf); static void find_or_create_manifest_app_and_loc_options_containers(manifest_gen_ctx_t *ctx, passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf,