Mercurial > hg > nginx
diff src/http/modules/ngx_http_static_handler.c @ 143:5526213be452
nginx-0.0.1-2003-10-10-19:10:50 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 10 Oct 2003 15:10:50 +0000 |
parents | cb77c084acdb |
children | 5afee0074707 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_static_handler.c Thu Oct 09 07:00:45 2003 +0000 +++ b/src/http/modules/ngx_http_static_handler.c Fri Oct 10 15:10:50 2003 +0000 @@ -127,33 +127,12 @@ rc = ngx_http_send_header(r); - if (rc == NGX_ERROR || rc > NGX_OK) { - ngx_http_finalize_request(r, rc); - return NGX_OK; + + if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { + return rc; } - if (r->header_only) { - ngx_http_finalize_request(r, rc); - -#if 0 - if (rc == NGX_AGAIN) { - ngx_http_set_write_handler(r); - - } else { - ngx_http_finalize_request(r, 0); - } -#endif - - return NGX_OK; - } - - -#if 0 h->type = r->main ? NGX_HUNK_FILE : NGX_HUNK_FILE|NGX_HUNK_LAST; -#else - h->type = NGX_HUNK_FILE; -#endif - h->file_pos = 0; h->file_last = ngx_file_size(r->file.info); @@ -161,20 +140,5 @@ h->file->fd = r->file.fd; h->file->log = r->connection->log; - rc = ngx_http_output_filter(r, h); - - ngx_http_finalize_request(r, rc); - -#if 0 - if (r->main == NULL) { - if (rc == NGX_AGAIN) { - ngx_http_set_write_handler(r); - - } else { - ngx_http_finalize_request(r, 0); - } - } -#endif - - return NGX_OK; + return ngx_http_output_filter(r, h); }