nginx-0.3.14-RELEASE import
*) Bugfix: in the 304 response the body was transferred; the bug had
appeared in 0.3.13.
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index 999f11f..32d451f 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -9,6 +9,22 @@
<title lang="en">nginx changelog</title>
+<changes ver="0.3.14" date="05.12.2005">
+
+<change type="bugfix">
+<para lang="ru">
+× ÏÔ×ÅÔÅ 304 ÐÅÒÅÄÁ×ÁÌÏÓØ ÔÅÌÏ ÏÔ×ÅÔÁ;
+ÏÛÉÂËÁ ÐÏÑ×ÉÌÁÓØ × 0.3.13.
+</para>
+<para lang="en">
+in the 304 response the body was transferred;
+bug appeared in 0.3.13.
+</para>
+</change>
+
+</changes>
+
+
<changes ver="0.3.13" date="05.12.2005">
<change type="feature">
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 9505aee..f99cca8 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 1504f24..e9d2b39 100644
--- a/src/http/modules/ngx_http_static_module.c
+++ b/src/http/modules/ngx_http_static_module.c
@@ -264,7 +264,7 @@
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 115b991..f3830a8 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 5347cd9..1ed7239 100644
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c
@@ -23,7 +23,7 @@
#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 @@
#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;
