← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/os/unix/ngx_linux_sendfile_chain.c

  • Committer: Bazaar Package Importer
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2010-11-27 21:04:02 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 36.
  • Revision ID: james.westby@ubuntu.com-20101127210402-14sgjpe6r3jup8a9
Tags: 0.8.53-1
http://bugs.debian.org/592147
http://bugs.debian.org/593142
http://bugs.debian.org/593143
http://bugs.debian.org/594598
http://bugs.debian.org/602970
http://bugs.debian.org/581416
[Kartik Mistry]
* debian/control:
  + Added Michael Lustfield as co-maintainer
* nginx.conf:
  + No need to use regex in gzip_disable for msie6, Thanks to António P. P.
    Almeida <appa@perusio.net> (Closes: #592147)
* conf/sites-available/default:
  + Fixed typo for "include fastcgi", Thanks to Mostafa Ghadamyari
    <nginx@gigfa.com> (Closes: #593142, #593143)
* debian/patches/fix_reloading_ipv6.diff:
  + Removed, merged upstream
* debian/init.d:
  + Added fix to control nginx by user in a simple way by setting DAEMON
    variable to an invalid name in /etc/default/nginx. Patch by Toni Mueller
    <support@oeko.net> (Closes: #594598)
* debian/NEWS.Debian:
  + Updated news for 0.8.x as stable branch

[Michael Lustfield]
* New upstream release (Closes: #602970)
  + 0.8.x branch is declared stable by upstream now
* Add a UFW profile set:
  + debian/nginx.ufw.profile: Added.
  + debian/control: nginx: Suggests ufw.
  + debian/dirs: Add 'etc/ufw/applications.d'
  + debian/rules: Add install rule for the nginx UFW profile.
* Moved debian/dirs to debian/nginx.dirs
* Added types_hash_max_size to nginx.conf
* Install simple default index.html file (Closes: #581416)
  + debian/dirs: Add 'usr/share/nginx/www'.
  + debian/nginx.install: Add 'html/* usr/share/nginx/www'.
* debian/patches/nginx-echo.diff:
  + Added Echo module
* Added files for nginx.docs
  - /usr/share/doc/nginx/
    + debian/help/docs/fcgiwrap
    + debian/help/docs/php
    + debian/help/docs/support-irc
    + debian/help/docs/upstream
* Added files for nginx.examples
  - /usr/share/doc/nginx/examples/
    + debian/help/docs/drupal
    + debian/help/docs/http
    + debian/help/docs/mail
    + debian/help/docs/mailman
    + debian/help/docs/nginx.conf
    + debian/help/docs/virtual_hosts
    + debian/help/docs/wordpress
* debian/conf/:
  + Removed excess spaces
  + Added tabs where appropriate
  + Added SCRIPT_FILENAME to fastcgi_params

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/os/unix/ngx_linux_sendfile_chain.c
263
263
            if (rc == -1) {
264
264
                err = ngx_errno;
265
265
 
266
 
                if (err == NGX_EAGAIN || err == NGX_EINTR) {
267
 
                    if (err == NGX_EINTR) {
268
 
                        eintr = 1;
269
 
                    }
270
 
 
271
 
                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
272
 
                                   "sendfile() is not ready");
273
 
 
274
 
                } else {
 
266
                switch (err) {
 
267
                case NGX_EAGAIN:
 
268
                    break;
 
269
 
 
270
                case NGX_EINTR:
 
271
                    eintr = 1;
 
272
                    break;
 
273
 
 
274
                default:
275
275
                    wev->error = 1;
276
276
                    ngx_connection_error(c, err, "sendfile() failed");
277
277
                    return NGX_CHAIN_ERROR;
278
278
                }
 
279
 
 
280
                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
 
281
                               "sendfile() is not ready");
279
282
            }
280
283
 
281
284
            sent = rc > 0 ? rc : 0;
290
293
            if (rc == -1) {
291
294
                err = ngx_errno;
292
295
 
293
 
                if (err == NGX_EAGAIN || err == NGX_EINTR) {
294
 
                    if (err == NGX_EINTR) {
295
 
                        eintr = 1;
296
 
                    }
297
 
 
298
 
                    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
299
 
                                   "writev() not ready");
300
 
 
301
 
                } else {
 
296
                switch (err) {
 
297
                case NGX_EAGAIN:
 
298
                    break;
 
299
 
 
300
                case NGX_EINTR:
 
301
                    eintr = 1;
 
302
                    break;
 
303
 
 
304
                default:
302
305
                    wev->error = 1;
303
306
                    ngx_connection_error(c, err, "writev() failed");
304
307
                    return NGX_CHAIN_ERROR;
305
308
                }
 
309
 
 
310
                ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
 
311
                               "writev() not ready");
306
312
            }
307
313
 
308
314
            sent = rc > 0 ? rc : 0;