IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.3.14-RELEASE import

Browse Source 
*) Bugfix: in the 304 response the body was transferred; the bug had
       appeared in 0.3.13.
This commit is contained in:
Igor Sysoev 2005-12-05 16:59:05 +00:00
parent ed98ff126b
commit 2334060587
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/xml/nginx/changes.xml
View File

@ -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">

2
src/core/nginx.h
View File

@ -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"

2
src/http/modules/ngx_http_static_module.c
View File

@ -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;
}

4
src/os/unix/ngx_linux_sendfile_chain.c
View File

@ -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;

6
src/os/unix/ngx_solaris_sendfilev_chain.c
View File

@ -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;