]> git.kaiwu.me - nginx.git/commitdiff
previous commit broke two modules
authorIgor Sysoev <igor@sysoev.ru>
Thu, 12 Oct 2006 13:56:16 +0000 (13:56 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 12 Oct 2006 13:56:16 +0000 (13:56 +0000)
src/http/modules/ngx_http_flv_module.c
src/http/modules/perl/nginx.xs

index dfe4299ec4c7cf755c34b8e61097743e313d8357..6030b7ba0e3d7d158130c428b5099ffc232cd94e 100644 (file)
@@ -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;
     }
 
index d261afa02b1250e729c6f093c3b597a70537f9e2..f65bbf093549a47c7a7886be98646ee821dfff3f 100644 (file)
@@ -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;
     }