From dc44c5327241e3229ef12fb1a9c895e92a6f94e1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 12 Oct 2006 13:56:16 +0000 Subject: [PATCH] previous commit broke two modules --- src/http/modules/ngx_http_flv_module.c | 3 ++- src/http/modules/perl/nginx.xs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c index dfe4299ec..6030b7ba0 100644 --- 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 *r) { 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 *r) 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 index d261afa02..f65bbf093 100644 --- 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; }