Mercurial > hg > nginx-ranges
changeset 134:1898c6d03d90 NGINX_0_3_14
nginx 0.3.14
*) Bugfix: in the 304 response the body was transferred; bug appeared
in 0.3.13.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 05 Dec 2005 00:00:00 +0300 |
parents | e7ac35c352cb |
children | c1ac76c0e9df |
files | CHANGES CHANGES.ru src/core/nginx.h src/http/modules/ngx_http_static_module.c src/os/unix/ngx_linux_sendfile_chain.c src/os/unix/ngx_solaris_sendfilev_chain.c |
diffstat | 6 files changed, 19 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ + +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
--- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,3 +1,9 @@ + +Изменения в nginx 0.3.14 05.12.2005 + + *) Исправление: в ответе 304 передавалось тело ответа; ошибка появилась + в 0.3.13. + Изменения в nginx 0.3.13 05.12.2005
--- 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"
--- 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 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; }
--- 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;
--- 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 s #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;