← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nginx/quantal

« back to all changes in this revision

Viewing changes to src/http/ngx_http_request.c

  • Committer: Package Import Robot
  • Author(s): Kartik Mistry, Kartik Mistry, Michael Lustfield
  • Date: 2011-11-18 23:44:00 UTC
  • mfrom: (4.2.39 sid)
  • Revision ID: package-import@ubuntu.com-20111118234400-atj8d0zog78vgdte
Tags: 1.1.8-1
http://bugs.debian.org/649061
https://launchpad.net/bugs/825349
https://launchpad.net/bugs/857831
https://launchpad.net/bugs/883440
http://bugs.debian.org/642995
https://launchpad.net/bugs/840358
[Kartik Mistry]
* New upstream release.
* debian/modules/chunkin-nginx-module:
  + Removed as of now, as it breaks with Perl 5.14 (Closes: #649061)

[Michael Lustfield]
* debian/control:
  + Added Map module to nginx-light modules list.
* debian/rules:
  + Removed --without-http_map_module form nginx-light.
* debian/nginx-common.install:
  + Changed ufw profile installation (LP: #825349).
    - debian/ufw.profile -> debian/ufw/nginx.
* debian/nginx-common.preinst:
  + Cleanup of moved nginx profile.
* debian/conf/nginx.conf:
  + Added a default map for $server_https (on|off).
* debian/conf/fastcgi_params:
  + Pass HTTPS so $_SERVER['HTTPS'] is set (LP: #857831).
* debian/conf/mime.types:
  + Added json type (LP: #883440).
* debian/conf/sites-available/default:
  + Added notes about PHP (Closes: #642995).
  + Changed location /doc from root to alias.
  + Changed location /doc to /doc/ for people that don't bother reading or
    learning anything about Nginx configuration files (LP: #840358).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/ngx_http_request.c
2270
2270
            return;
2271
2271
        }
2272
2272
 
2273
 
    } else {
2274
 
        if (wev->delayed || r->aio) {
2275
 
            ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
2276
 
                           "http writer delayed");
2277
 
 
2278
 
            if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
2279
 
                ngx_http_close_request(r, 0);
2280
 
            }
2281
 
 
2282
 
            return;
 
2273
    }
 
2274
 
 
2275
    if (wev->delayed || r->aio) {
 
2276
        ngx_log_debug0(NGX_LOG_DEBUG_HTTP, wev->log, 0,
 
2277
                       "http writer delayed");
 
2278
 
 
2279
        if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) {
 
2280
            ngx_http_close_request(r, 0);
2283
2281
        }
 
2282
 
 
2283
        return;
2284
2284
    }
2285
2285
 
2286
2286
    rc = ngx_http_output_filter(r, NULL);
2296
2296
 
2297
2297
    if (r->buffered || r->postponed || (r == r->main && c->buffered)) {
2298
2298
 
2299
 
        if (!wev->ready && !wev->delayed) {
 
2299
        if (!wev->delayed) {
2300
2300
            ngx_add_timer(wev, clcf->send_timeout);
2301
2301
        }
2302
2302