Ignore:
Timestamp:
01/27/08 12:27:44 (4 years ago)
Author:
Tomash Brechko <tomash.brechko@…>
Branches:
master-v0.7, master-v0.6, upstream_count_limit
Children:
3e654c
Parents:
432a6a (diff), 66a597 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Tomash Brechko <tomash.brechko@…> (01/27/08 12:27:44)
git-committer:
Tomash Brechko <tomash.brechko@…> (01/27/08 12:27:44)
Message:

Merge branch 'next_upstream'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • server/src/http/ngx_http_upstream.h

    rde9561 r445d49  
    2525#define NGX_HTTP_UPSTREAM_FT_BUSY_LOCK       0x00000080 
    2626#define NGX_HTTP_UPSTREAM_FT_MAX_WAITING     0x00000100 
     27#define NGX_HTTP_UPSTREAM_FT_HTTP_502        0x00000200 
     28#define NGX_HTTP_UPSTREAM_FT_HTTP_504        0x00000400 
     29#define NGX_HTTP_UPSTREAM_FT_HTTP_507        0x00000800 
    2730#define NGX_HTTP_UPSTREAM_FT_OFF             0x80000000 
    2831 
Note: See TracChangeset for help on using the changeset viewer.