aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2006-10-12 13:56:16 +0000
committerIgor Sysoev <igor@sysoev.ru>2006-10-12 13:56:16 +0000
commitd79b21d1c6c36cf8687336e8b4bde59e9380cab2 (patch)
tree4b93e2d2728f9a437f264f1d9c4aea40194a0077
parent0e5f86d871713b35e6e402ceee3435675c2c5b7f (diff)
downloadnginx-d79b21d1c6c36cf8687336e8b4bde59e9380cab2.tar.gz
nginx-d79b21d1c6c36cf8687336e8b4bde59e9380cab2.zip
previous commit broke two modules
-rw-r--r--src/http/modules/ngx_http_flv_module.c3
-rw-r--r--src/http/modules/perl/nginx.xs3
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;
}