1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00

fix issue with incorrect munging of the lua package path -- LuaPackagePath directives were not working

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1200475 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brian McCallister
2011-11-10 18:48:50 +00:00
parent 1bdcf2c3f6
commit 1cedf45414
4 changed files with 38 additions and 8 deletions

View File

@@ -863,16 +863,22 @@ static const char *register_quick_block(cmd_parms *cmd, void *_cfg,
static const char *register_package_helper(cmd_parms *cmd, const char *arg,
static const char *register_package_helper(cmd_parms *cmd,
const char *arg,
apr_array_header_t *dir_array)
{
apr_status_t rv;
ap_lua_server_cfg *server_cfg =
ap_get_module_config(cmd->server->module_config, &lua_module);
char *fixed_filename;
rv = apr_filepath_merge(&fixed_filename, server_cfg->root_path, arg,
APR_FILEPATH_NOTRELATIVE, cmd->pool);
rv = apr_filepath_merge(&fixed_filename,
server_cfg->root_path,
arg,
APR_FILEPATH_NOTRELATIVE,
cmd->pool);
if (rv != APR_SUCCESS) {
return apr_psprintf(cmd->pool,
"Unable to build full path to file, %s", arg);