# HG changeset patch # User Igor Sysoev # Date 1160661376 0 # Node ID 589841f06b87ef3ede767b561b23bf89be2a4ac1 # Parent c3ebeee31026f0b678e637be7670c0c2bb3d08e7 previous commit broke two modules diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c --- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -62,6 +62,7 @@ ngx_http_flv_handler(ngx_http_request_t { u_char *p; off_t start, len; + size_t root; ngx_fd_t fd; ngx_int_t rc; ngx_uint_t level, i; @@ -94,7 +95,7 @@ ngx_http_flv_handler(ngx_http_request_t return rc; } - if (ngx_http_map_uri_to_path(r, &path, 0) == NULL) { + if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } diff --git a/src/http/modules/perl/nginx.xs b/src/http/modules/perl/nginx.xs --- a/src/http/modules/perl/nginx.xs +++ b/src/http/modules/perl/nginx.xs @@ -453,6 +453,7 @@ filename(r) CODE: dXSTARG; + size_t root; ngx_http_request_t *r; ngx_http_perl_ctx_t *ctx; @@ -463,7 +464,7 @@ filename(r) goto done; } - if (ngx_http_map_uri_to_path(r, &ctx->filename, 0) == NULL) { + if (ngx_http_map_uri_to_path(r, &ctx->filename, &root, 0) == NULL) { XSRETURN_UNDEF; }