diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-05 16:55:36 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2005-12-05 16:55:36 +0000 |
| commit | 1e8b202b5767ac9f14d1ee5aff3ab55f250bbec5 (patch) | |
| tree | f5523beb18a2f1bcd94d444ea56b56c0ec1aa97d | |
| parent | fe8aea1c269aa447b4b7af354f930523109fdccd (diff) | |
| download | nginx-1e8b202b5767ac9f14d1ee5aff3ab55f250bbec5.tar.gz | |
Changes with nginx 0.3.14 05 Dec 2005v0.3.14
*) Bugfix: in the 304 response the body was transferred; bug appeared
in 0.3.13.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 6 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_static_module.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_sendfile_chain.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_solaris_sendfilev_chain.c | 6 |
6 files changed, 19 insertions, 7 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.3.14 05 Dec 2005 + + *) Bugfix: in the 304 response the body was transferred; bug appeared + in 0.3.13. + + Changes with nginx 0.3.13 05 Dec 2005 *) Feature: the IMAP/POP3 proxy supports STARTTLS and STLS. diff --git a/CHANGES.ru b/CHANGES.ru index 8cfc7ecdc..8aea6e3dd 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,10 @@ +Изменения в nginx 0.3.14 05.12.2005 + + *) Исправление: в ответе 304 передавалось тело ответа; ошибка появилась + в 0.3.13. + + Изменения в nginx 0.3.13 05.12.2005 *) Добавление: IMAP/POP3 прокси поддерживает STARTTLS и STLS. diff --git a/src/core/nginx.h b/src/core/nginx.h index 9505aee96..f99cca8f9 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.13" +#define NGINX_VER "nginx/0.3.14" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin" diff --git a/src/http/modules/ngx_http_static_module.c b/src/http/modules/ngx_http_static_module.c index 1504f241d..e9d2b395d 100644 --- a/src/http/modules/ngx_http_static_module.c +++ b/src/http/modules/ngx_http_static_module.c @@ -264,7 +264,7 @@ ngx_http_static_handler(ngx_http_request_t *r) rc = ngx_http_send_header(r); - if (rc == NGX_ERROR || rc > NGX_OK) { + if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { return rc; } diff --git a/src/os/unix/ngx_linux_sendfile_chain.c b/src/os/unix/ngx_linux_sendfile_chain.c index 115b9911b..f3830a8b3 100644 --- a/src/os/unix/ngx_linux_sendfile_chain.c +++ b/src/os/unix/ngx_linux_sendfile_chain.c @@ -23,8 +23,8 @@ #define NGX_HEADERS 8 -ngx_chain_t *ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, - off_t limit) +ngx_chain_t * +ngx_linux_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { int rc, tcp_nodelay; u_char *prev; diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c index 5347cd9d2..1ed7239c2 100644 --- a/src/os/unix/ngx_solaris_sendfilev_chain.c +++ b/src/os/unix/ngx_solaris_sendfilev_chain.c @@ -23,7 +23,7 @@ typedef struct sendfilevec { #define SFV_FD_SELF -2 static ssize_t sendfilev(int fd, const struct sendfilevec *vec, - int sfvcnt, size_t *xferred) + int sfvcnt, size_t *xferred) { return -1; } @@ -34,8 +34,8 @@ static ssize_t sendfilev(int fd, const struct sendfilevec *vec, #define NGX_SENDFILEVECS 16 -ngx_chain_t *ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, - off_t limit) +ngx_chain_t * +ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit) { int fd; u_char *prev; |