nginx: src/http/modules/ngx_http_split_clients

Fixed calculation of range boundaries.

comparison

equal deleted inserted replaced

-:1a11e4a8877a
+:ae63013cbffa
 for (i = 0; i < ctx->parts.nelts; i++) {
 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
 "http split: %uD %uD", hash, part[i].percent);
-if (hash < part[i].percent) {
+if (hash < part[i].percent || part[i].percent == 0) {
 *v = part[i].value;
 return NGX_OK;
 }
 }
 static char *
 ngx_conf_split_clients_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
 char                                *rv;
+uint32_t                             sum, last;
 ngx_str_t                           *value, name;
-ngx_uint_t                           i, sum, last;
+ngx_uint_t                           i;
 ngx_conf_t                           save;
 ngx_http_variable_t                 *var;
 ngx_http_split_clients_ctx_t        *ctx;
 ngx_http_split_clients_part_t       *part;
 ngx_http_compile_complex_value_t     ccv;
 part = ctx->parts.elts;
 for (i = 0; i < ctx->parts.nelts; i++) {
 sum = part[i].percent ? sum + part[i].percent : 10000;
 if (sum > 10000) {
 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
 "percent sum is more than 100%%");
 return NGX_CONF_ERROR;
 }
 if (part[i].percent) {
-part[i].percent = (uint32_t)
+last += part[i].percent * (uint64_t) 0xffffffff / 10000;
-(last + 0xffffffff / 10000 * part[i].percent);
+part[i].percent = last;
-} else {
+}
-part[i].percent = 0xffffffff;
-}
-last = part[i].percent;
 }
 return rv;
 }

Mercurial > hg > nginx