Merge pull request #2 from qualtrics/master

Fixed a bug ngx_http_upstream_fair_sched_score function.
gnosek · Nov 11, 2011 · 7171df8 · 7171df8
2 parents 2131c73 + 2b0837a
commit 7171df8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ngx_http_upstream_fair_module.c b/ngx_http_upstream_fair_module.c
@@ -679,7 +679,7 @@ ngx_http_upstream_fair_update_nreq(ngx_http_upstream_fair_peer_data_t *fp, int d
 #define SCHED_COUNTER_BITS 20
 #define SCHED_NREQ_MAX ((~0UL) >> SCHED_COUNTER_BITS)
 #define SCHED_COUNTER_MAX ((1 << SCHED_COUNTER_BITS) - 1)
-#define SCHED_SCORE(nreq,delta) (((nreq) << SCHED_COUNTER_BITS) | (~(delta)))
+#define SCHED_SCORE(nreq,delta) (((nreq) << SCHED_COUNTER_BITS) | (~(delta) & SCHED_COUNTER_MAX))
 #define ngx_upstream_fair_min(a,b) (((a) < (b)) ? (a) : (b))
 
 static ngx_uint_t