Mercurial > hg > nginx-vendor-current

diff src/event/ngx_event_pipe.c @ 130:82d695e3d662 NGINX_0_3_12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.12 *) Security: if nginx was built with the ngx_http_realip_module and the "satisfy_any on" directive was used, then access and authorization directives did not work. The ngx_http_realip_module was not built and is not built by default. *) Change: the "$time_gmt" variable name was changed to "$time_local". *) Change: the "proxy_header_buffer_size" and "fastcgi_header_buffer_size" directives was renamed to the "proxy_buffer_size" and "fastcgi_buffer_size" directives. *) Feature: the ngx_http_memcached_module. *) Feature: the "proxy_buffering" directive. *) Bugfix: the changes in accept mutex handling when the "rtsig" method was used; bug appeared in 0.3.0. *) Bugfix: if the client sent the "Transfer-Encoding: chunked" header line, then nginx returns the 411 error. *) Bugfix: if the "auth_basic" directive was inherited from the http level, then the realm in the "WWW-Authenticate" header line was without the "Basic realm" text. *) Bugfix: if the "combined" format was explicitly specified in the "access_log" directive, then the empty lines was written to the log; bug appeared in 0.3.8. *) Bugfix: nginx did not run on the sparc platform under any OS except Solaris. *) Bugfix: now it is not necessary to place space between the quoted string and closing bracket in the "if" directive.
author Igor Sysoev <http://sysoev.ru>
date Sat, 26 Nov 2005 00:00:00 +0300
parents df17fbafec8f
children 91372f004adf
line wrap: on
line diff
--- a/src/event/ngx_event_pipe.c
+++ b/src/event/ngx_event_pipe.c
@@ -122,6 +122,8 @@ ngx_event_pipe_read_upstream(ngx_event_p
 
         } else {
 
+#if (NGX_HAVE_KQUEUE)
+
             /*
              * kqueue notifies about the end of file or a pending error.
              * This test allows not to allocate a buf on these conditions
@@ -129,14 +131,15 @@ ngx_event_pipe_read_upstream(ngx_event_p
              */
 
             if (p->upstream->read->available == 0
-                && p->upstream->read->pending_eof)
+                && p->upstream->read->pending_eof
+                /* FreeBSD 5.x-6.x may erroneously report ETIMEDOUT */
+                && p->upstream->read->kq_errno != NGX_ETIMEDOUT)
             {
                 p->upstream->read->ready = 0;
                 p->upstream->read->eof = 0;
                 p->upstream_eof = 1;
                 p->read = 1;
 
-#if (NGX_HAVE_KQUEUE)
                 if (p->upstream->read->kq_errno) {
                     p->upstream->read->error = 1;
                     p->upstream_error = 1;
@@ -144,12 +147,13 @@ ngx_event_pipe_read_upstream(ngx_event_p
 
                     ngx_log_error(NGX_LOG_ERR, p->log,
                                   p->upstream->read->kq_errno,
-                                  "readv() failed");
+                                  "kevent() reported that upstream "
+                                  "closed connection");
                 }
-#endif
 
                 break;
             }
+#endif
 
             if (p->free_raw_bufs) {