diff options
author | Igor Sysoev <igor@sysoev.ru> | 2007-09-24 04:11:57 +0000 |
---|---|---|
committer | Jonathan Kolb <jon@b0g.us> | 2007-09-24 04:11:57 +0000 |
commit | d437da51e04eebdb4c2245e30cbe3d0add2690c0 (patch) | |
tree | 548f970b329ab0984148dc2afaa3eab7bea9ce92 | |
parent | 2c482feea54c261e9f67609ef84d6e3298a1fd9b (diff) | |
download | nginx-d437da51e04eebdb4c2245e30cbe3d0add2690c0.tar.gz |
Changes with nginx 0.6.13 24 Sep 2007v0.6.13
*) Bugfix: nginx did not close directory file on HEAD request if
autoindex was used.
Thanks to Arkadiusz Patyk.
-rw-r--r-- | CHANGES | 7 | ||||
-rw-r--r-- | CHANGES.ru | 7 | ||||
-rw-r--r-- | auto/options | 5 | ||||
-rw-r--r-- | src/core/nginx.h | 2 | ||||
-rw-r--r-- | src/http/modules/ngx_http_autoindex_module.c | 5 | ||||
-rw-r--r-- | src/http/modules/perl/nginx.pm | 2 |
6 files changed, 25 insertions, 3 deletions
@@ -1,4 +1,11 @@ +Changes with nginx 0.6.13 24 Sep 2007 + + *) Bugfix: nginx did not close directory file on HEAD request if + autoindex was used. + Thanks to Arkadiusz Patyk. + + Changes with nginx 0.6.12 21 Sep 2007 *) Change: mail proxy was split on three modules: pop3, imap and smtp. diff --git a/CHANGES.ru b/CHANGES.ru index 391290674..38f4022f6 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,11 @@ +Изменения в nginx 0.6.13 24.09.2007 + + *) Исправление: nginx не закрывал файл каталога для запроса HEAD, если + использовался autoindex + Спасибо Arkadiusz Patyk. + + Изменения в nginx 0.6.12 21.09.2007 *) Изменение: почтовый прокси-сервер разделён на три модуля: pop3, imap diff --git a/auto/options b/auto/options index 4fe4dddff..25eb6fb5b 100644 --- a/auto/options +++ b/auto/options @@ -308,8 +308,11 @@ cat << END --without-http disable HTTP server - --with-mail enable IMAP4/POP3/SMTP proxy module + --with-mail enable POP3/IMAP4/SMTP proxy module --with-mail_ssl_module enable ngx_mail_ssl_module + --without-mail_pop3_module disable ngx_mail_pop3_module + --without-mail_imap_module disable ngx_mail_imap_module + --without-mail_smtp_module disable ngx_mail_smtp_module --add-module=PATH enable an external module diff --git a/src/core/nginx.h b/src/core/nginx.h index 50b4ab539..200dcd059 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VERSION "0.6.12" +#define NGINX_VERSION "0.6.13" #define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VAR "NGINX" diff --git a/src/http/modules/ngx_http_autoindex_module.c b/src/http/modules/ngx_http_autoindex_module.c index e08e63c8f..ae9eaabbb 100644 --- a/src/http/modules/ngx_http_autoindex_module.c +++ b/src/http/modules/ngx_http_autoindex_module.c @@ -236,6 +236,11 @@ ngx_http_autoindex_handler(ngx_http_request_t *r) rc = ngx_http_send_header(r); if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { + if (ngx_close_dir(&dir) == NGX_ERROR) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, ngx_errno, + ngx_close_dir_n " \"%V\" failed", &path); + } + return rc; } diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 519e6c07c..eee9cbe34 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.6.12'; +our $VERSION = '0.6.13'; require XSLoader; XSLoader::load('nginx', $VERSION); |