Mercurial > hg > nginx
diff src/core/ngx_file.c @ 563:9c2f3ed7a247 release-0.3.3
nginx-0.3.3-RELEASE import
*) Change: the "bl" and "af" parameters of the "listen" directive was
renamed to the "backlog" and "accept_filter".
*) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen"
directive.
*) Change: the "$msec" log parameter does not require now the
additional the gettimeofday() system call.
*) Feature: the -t switch now tests the "listen" directives.
*) Bugfix: if the invalid address was specified in the "listen"
directive, then after the -HUP signal nginx left an open socket in
the CLOSED state.
*) Bugfix: the mime type may be incorrectly set to default value for
index file with variable in the name; the bug had appeared in 0.3.0.
*) Feature: the "timer_resolution" directive.
*) Feature: the millisecond "$upstream_response_time" log parameter.
*) Bugfix: a temporary file with client request body now is removed
just after the response header was transferred to a client.
*) Bugfix: OpenSSL 0.9.6 compatibility.
*) Bugfix: the SSL certificate and key file paths could not be relative.
*) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in
the ngx_imap_ssl_module.
*) Bugfix: the "ssl_protocols" directive allowed to specify the single
protocol only.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 19 Oct 2005 12:33:58 +0000 |
parents | e48ebafc6939 |
children | 65bf042c0b4f |
line wrap: on
line diff
--- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -40,8 +40,8 @@ ngx_create_temp_file(ngx_file_t *file, n { ngx_err_t err; ngx_atomic_uint_t n; - ngx_pool_cleanup_file_t *cln; - + ngx_pool_cleanup_t *cln; + ngx_pool_cleanup_file_t *clnf; file->name.len = path->name.len + 1 + path->len + NGX_ATOMIC_T_LEN; @@ -66,6 +66,11 @@ ngx_create_temp_file(ngx_file_t *file, n ngx_create_hashed_filename(file, path); + cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)); + if (cln == NULL) { + return NGX_ERROR; + } + #if 1 file->fd = ngx_open_tempfile(file->name.data, persistent); #else @@ -76,19 +81,13 @@ ngx_create_temp_file(ngx_file_t *file, n "temp fd:%d", file->fd); if (file->fd != NGX_INVALID_FILE) { - cln = ngx_palloc(pool, sizeof(ngx_pool_cleanup_file_t)); - if (cln == NULL) { - return NGX_ERROR; - } + + cln->handler = ngx_pool_cleanup_file; + clnf = cln->data; - cln->fd = file->fd; - cln->name = file->name.data; - cln->log = pool->log; - - if (ngx_pool_cleanup_add(pool, ngx_pool_cleanup_file, cln) == NULL) - { - return NGX_ERROR; - } + clnf->fd = file->fd; + clnf->name = file->name.data; + clnf->log = pool->log; return NGX_OK; }