Mercurial > hg > nginx
diff src/http/modules/ngx_http_index_handler.c @ 1:d220029ac7f3
nginx-0.0.1-2002-08-15-21:20:26 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 15 Aug 2002 17:20:26 +0000 |
parents | 4eff17414a43 |
children | 4f3879d9b6f6 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_index_handler.c +++ b/src/http/modules/ngx_http_index_handler.c @@ -20,10 +20,11 @@ int ngx_http_index_handler(ngx_http_requ ngx_get_module_loc_conf(r, &ngx_http_index_handler_module); index_len = (*(r->uri_end - 1) == '/') ? cf->max_index_len : 0; - name = ngx_palloc(r->pool, r->uri_end - r->uri_start + index_len - + r->server->doc_root_len); - if (name == NULL) - return NGX_ERROR; + + ngx_test_null(name, + ngx_palloc(r->pool, r->uri_end - r->uri_start + index_len + + r->server->doc_root_len), + NGX_HTTP_INTERNAL_SERVER_ERROR); loc = ngx_cpystrn(name, r->server->doc_root, r->server->doc_root_len); file = ngx_cpystrn(loc, r->uri_start, r->uri_end - r->uri_start + 1); @@ -39,7 +40,7 @@ int ngx_http_index_handler(ngx_http_requ if (err == NGX_ENOENT) return NGX_HTTP_NOT_FOUND; else - return NGX_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } if (ngx_is_dir(r->stat)) {