← Back to branch summary

~britco/nginx/master

« back to all changes in this revision

Viewing changes to src/http/ngx_http_upstream.h

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Hahler
  • Date: 2009-10-19 23:22:06 UTC
  • mfrom: (1.1.13 upstream) (4.2.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091019232206-g128vef5ewsjg4tf
Tags: 0.7.62-4ubuntu1
https://launchpad.net/bugs/450874
https://launchpad.net/bugs/308695
https://launchpad.net/bugs/260005
https://launchpad.net/bugs/440888
* Merge from debian unstable (LP: #450874), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.
* Closes: LP: #260005, LP: #440888

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/http/ngx_http_upstream.h
298
298
    unsigned                         accel:1;
299
299
    unsigned                         ssl:1;
300
300
#if (NGX_HTTP_CACHE)
301
 
    unsigned                         stale_cache:1;
 
301
    unsigned                         cache_status:3;
302
302
#endif
303
303
 
304
304
    unsigned                         buffering:1;