Mercurial > hg > nginx-vendor-current

diff src/os/unix/ngx_freebsd_sendfile_chain.c @ 28:7ca9bdc82b3f NGINX_0_1_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.14 *) Feature: the autoconfiguration directives: --http-client-body-temp-path=PATH, --http-proxy-temp-path=PATH, and --http-fastcgi-temp-path=PATH *) Change: the directory name for the temporary files with the client request body is specified by directive client_body_temp_path, by default it is <prefix>/client_body_temp. *) Feature: the ngx_http_fastcgi_module and the directives: fastcgi_pass, fastcgi_root, fastcgi_index, fastcgi_params, fastcgi_connect_timeout, fastcgi_send_timeout, fastcgi_read_timeout, fastcgi_send_lowat, fastcgi_header_buffer_size, fastcgi_buffers, fastcgi_busy_buffers_size, fastcgi_temp_path, fastcgi_max_temp_file_size, fastcgi_temp_file_write_size, fastcgi_next_upstream, and fastcgi_x_powered_by. *) Bugfix: the "[alert] zero size buf" error; bug appeared in 0.1.3. *) Change: the URI must be specified after the host name in the proxy_pass directive. *) Change: the %3F symbol in the URI was considered as the argument string start. *) Feature: the unix domain sockets support in the ngx_http_proxy_module. *) Feature: the ssl_engine and ssl_ciphers directives. Thanks to Sergey Skvortsov for SSL-accelerator.
author Igor Sysoev <http://sysoev.ru>
date Tue, 18 Jan 2005 00:00:00 +0300
parents 45fe5b98a9de
children da8c190bdaba
line wrap: on
line diff
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c
@@ -10,16 +10,16 @@
 
 
 /*
- * Although FreeBSD sendfile() allows to pass a header and a trailer
+ * Although FreeBSD sendfile() allows to pass a header and a trailer,
  * it can not send a header with a part of the file in one packet until
- * FreeBSD 5.3.  Besides over the fast ethernet connection sendfile()
+ * FreeBSD 5.3.  Besides, over the fast ethernet connection sendfile()
  * may send the partially filled packets, i.e. the 8 file pages may be sent
  * as the 11 full 1460-bytes packets, then one incomplete 324-bytes packet,
  * and then again the 11 full 1460-bytes packets.
  *
- * So we use the TCP_NOPUSH option (similar to Linux's TCP_CORK)
- * to postpone the sending - it not only sends a header and the first part
- * of the file in one packet but also sends the file pages in the full packets.
+ * Threfore we use the TCP_NOPUSH option (similar to Linux's TCP_CORK)
+ * to postpone the sending - it not only sends a header and the first part of
+ * the file in one packet, but also sends the file pages in the full packets.
  *
  * But until FreeBSD 4.5 the turning TCP_NOPUSH off does not flush a pending
  * data that less than MSS so that data may be sent with 5 second delay.
@@ -220,7 +220,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(
                     err = ngx_errno;
 
                     /*
-                     * there is a tiny chance to be interrupted, however
+                     * there is a tiny chance to be interrupted, however,
                      * we continue a processing without the TCP_NOPUSH
                      */
 
@@ -249,7 +249,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(
              * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771
              */
 
-            if (ngx_freebsd_sendfile_nbytes_bug == 0) {
+            if (!ngx_freebsd_sendfile_nbytes_bug) {
                 header_size = 0;
             }
 
@@ -282,7 +282,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(
             if (rc == 0 && sent == 0) {
 
                 /*
-                 * rc and sent are equals to zero when someone has truncated
+                 * rc and sent equal to zero when someone has truncated
                  * the file, so the offset became beyond the end of the file
                  */
 
@@ -370,8 +370,8 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(
         if (eagain) {
 
             /*
-             * sendfile() can return EAGAIN even if it has sent
-             * a whole file part but the successive sendfile() call would
+             * sendfile() may return EAGAIN, even if it has sent a whole file
+             * part, it indicates that the successive sendfile() call would
              * return EAGAIN right away and would not send anything.
              * We use it as a hint.
              */