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 999f11fcdee00bbe78958d9dfc87d611d710a5c0..32d451f415b17abcf9c1c0aa9dc3edada246c792 100644 (file)
--- 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 9505aee96538a35679362f64de7839495eaa7aa6..f99cca8f9e36d6166711bf69580f8cc0368ba881 100644 (file)
--- 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 1504f241d037e8fe59ffb711ffabf9707078d19e..e9d2b395dd1db1e84dfec92fb855b7505677408c 100644 (file)
--- 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 115b9911bb6d518f5079187f5441b313c0a2be1e..f3830a8b3b67c3aca3e09c1c84b945a10f94ba9d 100644 (file)
--- 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 5347cd9d2fbe3883b2be3b6c435f92a416b03048..1ed7239c2b70da54ce58bea027dbf468f7426dfa 100644 (file)
--- 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;