nginx-devel November 2018

nginx-devel@nginx.org

21 participants
90 discussions

by Maxim Dounin

Hello! On Tue, Sep 18, 2018 at 08:12:20AM -0400, Thomas Ward wrote: > Downstream in Ubuntu, it has been proposed to demote pcre3 and > use pcre2 instead as it is newer. > https://trac.nginx.org/nginx/ticket/720 shows it was marked 4 > years ago that NGINX does not support pcre2. Are there any > plans to use pcre2 instead of pcre3? There are no immediate plans. When we last checked, there were no problems with PCRE, but PCRE2 wasn't available in most distributions we support, making the switch mostly meaningless. Also, it looks like PCRE2 is still not supported even by Exim, which is the parent project of PCRE and PCRE2: https://bugs.exim.org/show_bug.cgi?id=1878 As such, adding PCRE2 support to nginx looks premature. -- Maxim Dounin http://mdounin.ru/

10 months

cache: move open to thread pool

by Ka-Hing Cheung

commit 0bcfefa040abdff674047c15701d237ff16a5f2b Author: Ka-Hing Cheung <kahing(a)cloudflare.com> Date: Fri Aug 3 13:37:58 2018 -0700 move open to thread pool At cloudflare we found that open() can block a long time, especially at p99 and p999. Moving it to thread pool improved overall p99 by 6x or so during peak time. This has the side effect of disabling nginx's open_file_cache when "aio threads" is turned on. For us we found that to have no impact (probably because we have way too many files for open file cache to be effective anyway). thread pool does increase CPU usage somewhat but we have not measured difference in CPU usage for stock "aio threads" compared to after this patch. Only the cache hit open() is moved to thread pool. We wrote more about it here: https://blog.cloudflare.com/how-we-scaled-nginx-and-saved-the-world-54-year… diff --git src/core/ngx_open_file_cache.c src/core/ngx_open_file_cache.c index b23ee78d..9177ebfd 100644 --- src/core/ngx_open_file_cache.c +++ src/core/ngx_open_file_cache.c @@ -35,8 +35,6 @@ static ngx_fd_t ngx_open_file_wrapper(ngx_str_t *name, ngx_int_t access, ngx_log_t *log); static ngx_int_t ngx_file_info_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, ngx_file_info_t *fi, ngx_log_t *log); -static ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, - ngx_open_file_info_t *of, ngx_log_t *log); static void ngx_open_file_add_event(ngx_open_file_cache_t *cache, ngx_cached_open_file_t *file, ngx_open_file_info_t *of, ngx_log_t *log); static void ngx_open_file_cleanup(void *data); @@ -836,7 +834,7 @@ ngx_file_info_wrapper(ngx_str_t *name, ngx_open_file_info_t *of, } -static ngx_int_t +ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, ngx_open_file_info_t *of, ngx_log_t *log) { diff --git src/core/ngx_open_file_cache.h src/core/ngx_open_file_cache.h index d119c129..94b4d552 100644 --- src/core/ngx_open_file_cache.h +++ src/core/ngx_open_file_cache.h @@ -124,6 +124,8 @@ ngx_open_file_cache_t *ngx_open_file_cache_init(ngx_pool_t *pool, ngx_uint_t max, time_t inactive); ngx_int_t ngx_open_cached_file(ngx_open_file_cache_t *cache, ngx_str_t *name, ngx_open_file_info_t *of, ngx_pool_t *pool); +ngx_int_t ngx_open_and_stat_file(ngx_str_t *name, + ngx_open_file_info_t *of, ngx_log_t *log); #endif /* _NGX_OPEN_FILE_CACHE_H_INCLUDED_ */ diff --git src/http/ngx_http_cache.h src/http/ngx_http_cache.h index f9e96640..2910f6a1 100644 --- src/http/ngx_http_cache.h +++ src/http/ngx_http_cache.h @@ -114,6 +114,7 @@ struct ngx_http_cache_s { unsigned exists:1; unsigned temp_file:1; unsigned purged:1; + unsigned opening:1; unsigned reading:1; unsigned secondary:1; unsigned background:1; diff --git src/http/ngx_http_file_cache.c src/http/ngx_http_file_cache.c index 56866fa4..9cb110bf 100644 --- src/http/ngx_http_file_cache.c +++ src/http/ngx_http_file_cache.c @@ -18,6 +18,10 @@ static void ngx_http_file_cache_lock_wait(ngx_http_request_t *r, ngx_http_cache_t *c); static ngx_int_t ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c); +static ngx_int_t ngx_http_file_cache_aio_open(ngx_http_request_t *r, + ngx_http_cache_t *c, ngx_int_t *rv); +static ngx_int_t ngx_http_file_cache_do_aio_open(ngx_http_request_t *r, + ngx_http_cache_t *c, ngx_open_file_info_t *of, ngx_int_t *rv); static ssize_t ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c); #if (NGX_HAVE_FILE_AIO) @@ -268,9 +272,7 @@ ngx_http_file_cache_open(ngx_http_request_t *r) ngx_uint_t test; ngx_http_cache_t *c; ngx_pool_cleanup_t *cln; - ngx_open_file_info_t of; ngx_http_file_cache_t *cache; - ngx_http_core_loc_conf_t *clcf; c = r->cache; @@ -278,6 +280,10 @@ ngx_http_file_cache_open(ngx_http_request_t *r) return NGX_AGAIN; } + if (c->opening) { + return ngx_http_file_cache_aio_open(r, c, &rv); + } + if (c->reading) { return ngx_http_file_cache_read(r, c); } @@ -343,23 +349,33 @@ ngx_http_file_cache_open(ngx_http_request_t *r) goto done; } - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + return ngx_http_file_cache_aio_open(r, c, &rv); - ngx_memzero(&of, sizeof(ngx_open_file_info_t)); +done: - of.uniq = c->uniq; - of.valid = clcf->open_file_cache_valid; - of.min_uses = clcf->open_file_cache_min_uses; - of.events = clcf->open_file_cache_events; - of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; - of.read_ahead = clcf->read_ahead; + if (rv == NGX_DECLINED) { + return ngx_http_file_cache_lock(r, c); + } - if (ngx_open_cached_file(clcf->open_file_cache, &c->file.name, &of, r->pool) - != NGX_OK) - { - switch (of.err) { + return rv; +} + +static ngx_int_t +ngx_http_file_cache_aio_open(ngx_http_request_t *r, ngx_http_cache_t *c, + ngx_int_t *rv) +{ + ngx_int_t rc; + ngx_open_file_info_t of; + ngx_http_file_cache_t *cache = c->file_cache; - case 0: + rc = ngx_http_file_cache_do_aio_open(r, c, &of, rv); + if (rc == NGX_AGAIN) { + return rc; + } + + if (rc != NGX_OK) { + switch (of.err) { + case NGX_OK: return NGX_ERROR; case NGX_ENOENT: @@ -391,14 +407,13 @@ ngx_http_file_cache_open(ngx_http_request_t *r) done: - if (rv == NGX_DECLINED) { + if (*rv == NGX_DECLINED) { return ngx_http_file_cache_lock(r, c); } - return rv; + return *rv; } - static ngx_int_t ngx_http_file_cache_lock(ngx_http_request_t *r, ngx_http_cache_t *c) { @@ -663,6 +678,127 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c) } +#if (NGX_THREADS) +typedef struct { + ngx_str_t name; + ngx_pool_t *pool; + ngx_open_file_info_t of; + ngx_int_t rv; +} ngx_thread_file_open_ctx_t; + +static void +ngx_http_file_cache_thread_open_handler(void *data, ngx_log_t *log) +{ + ngx_thread_file_open_ctx_t *ctx = data; + ngx_pool_t *pool = ctx->pool; + ngx_open_file_info_t *of = &ctx->of; + ngx_pool_cleanup_t *cln; + ngx_pool_cleanup_file_t *clnf; + ngx_int_t rc; + + ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "thread read handler"); + + cln = ngx_pool_cleanup_add(pool, sizeof(ngx_pool_cleanup_file_t)); + if (cln == NULL) { + ctx->of.err = NGX_ERROR; + return; + } + + of->fd = NGX_INVALID_FILE; + + rc = ngx_open_and_stat_file(&ctx->name, of, pool->log); + if (rc == NGX_OK && !of->is_dir) { + cln->handler = ngx_pool_cleanup_file; + clnf = cln->data; + + clnf->fd = of->fd; + clnf->name = ctx->name.data; + clnf->log = pool->log; + } +} + + +static ngx_int_t +ngx_http_file_cache_thread_open(ngx_http_cache_t *c, ngx_open_file_info_t *of, + ngx_int_t *rv, ngx_pool_t *pool) +{ + ngx_thread_task_t *task; + ngx_thread_file_open_ctx_t *ctx; + ngx_file_t *file = &c->file; + + task = file->thread_task; + + if (task == NULL) { + task = ngx_thread_task_alloc(pool, sizeof(ngx_thread_file_open_ctx_t)); + if (task == NULL) { + return NGX_ERROR; + } + + file->thread_task = task; + } + + ctx = task->ctx; + + if (task->event.complete) { + task->event.complete = 0; + + *of = ctx->of; + *rv = ctx->rv; + return of->err; + } + + task->handler = ngx_http_file_cache_thread_open_handler; + + ctx->pool = pool; + ctx->name = file->name; + ctx->of = *of; + ctx->rv = *rv; + + if (file->thread_handler(task, file) != NGX_OK) { + return NGX_ERROR; + } + + return NGX_AGAIN; +} +#endif + +static ngx_int_t +ngx_http_file_cache_do_aio_open(ngx_http_request_t *r, ngx_http_cache_t *c, + ngx_open_file_info_t *of, ngx_int_t *rv) +{ + ngx_http_core_loc_conf_t *clcf; + + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); + + ngx_memzero(of, sizeof(ngx_open_file_info_t)); + + of->uniq = c->uniq; + of->valid = clcf->open_file_cache_valid; + of->min_uses = clcf->open_file_cache_min_uses; + of->events = clcf->open_file_cache_events; + of->directio = NGX_OPEN_FILE_DIRECTIO_OFF; + of->read_ahead = clcf->read_ahead; + +#if (NGX_THREADS) + if (clcf->aio == NGX_HTTP_AIO_THREADS) { + ngx_int_t rc; + + c->file.thread_task = c->thread_task; + c->file.thread_handler = ngx_http_cache_thread_handler; + c->file.thread_ctx = r; + + rc = ngx_http_file_cache_thread_open(c, of, rv, r->pool); + + c->thread_task = c->file.thread_task; + c->opening = (rc == NGX_AGAIN); + + return rc; + } +#endif + + return ngx_open_cached_file(clcf->open_file_cache, &c->file.name, of, r->pool); +} + static ssize_t ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c) {

1 year

limit_rate_after support variables

by Miroslav Novy

# HG changeset patch # User Miroslav Nový <miranovy(a)gmail.com> # Date 1534234559 0 # Tue Aug 14 08:15:59 2018 +0000 # Node ID 1a8327b50f7844cbe68226f54de60632189327f4 # Parent 70c6b08973a02551612da4a4273757dc77c70ae2 limit_rate_after support variables Example of use: location / { root /var/www/default/; index index.html index.htm; set $my_limit_rate_after 2m; limit_rate_after $my_limit_rate_after; limit_rate 2k; access_by_lua_block { ngx.var.my_limit_rate_after = '10m' } } diff -r 70c6b08973a0 -r 1a8327b50f78 src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c Fri Aug 10 21:54:46 2018 +0300 +++ b/src/http/ngx_http_core_module.c Tue Aug 14 08:15:59 2018 +0000 @@ -487,7 +487,7 @@ { ngx_string("limit_rate_after"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |NGX_CONF_TAKE1, - ngx_conf_set_size_slot, + ngx_http_set_complex_value_slot, NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_core_loc_conf_t, limit_rate_after), NULL }, @@ -3364,6 +3364,7 @@ * clcf->alias = 0; * clcf->gzip_proxied = 0; * clcf->keepalive_disable = 0; + * clcf->limit_rate_after = NULL; */ clcf->client_max_body_size = NGX_CONF_UNSET; @@ -3393,7 +3394,6 @@ clcf->send_lowat = NGX_CONF_UNSET_SIZE; clcf->postpone_output = NGX_CONF_UNSET_SIZE; clcf->limit_rate = NGX_CONF_UNSET_SIZE; - clcf->limit_rate_after = NGX_CONF_UNSET_SIZE; clcf->keepalive_timeout = NGX_CONF_UNSET_MSEC; clcf->keepalive_header = NGX_CONF_UNSET; clcf->keepalive_requests = NGX_CONF_UNSET_UINT; @@ -3623,8 +3623,8 @@ ngx_conf_merge_size_value(conf->postpone_output, prev->postpone_output, 1460); ngx_conf_merge_size_value(conf->limit_rate, prev->limit_rate, 0); - ngx_conf_merge_size_value(conf->limit_rate_after, prev->limit_rate_after, - 0); + ngx_conf_merge_ptr_value(conf->limit_rate_after, prev->limit_rate_after, + NULL); ngx_conf_merge_msec_value(conf->keepalive_timeout, prev->keepalive_timeout, 75000); ngx_conf_merge_sec_value(conf->keepalive_header, diff -r 70c6b08973a0 -r 1a8327b50f78 src/http/ngx_http_core_module.h --- a/src/http/ngx_http_core_module.h Fri Aug 10 21:54:46 2018 +0300 +++ b/src/http/ngx_http_core_module.h Tue Aug 14 08:15:59 2018 +0000 @@ -351,7 +351,7 @@ size_t send_lowat; /* send_lowat */ size_t postpone_output; /* postpone_output */ size_t limit_rate; /* limit_rate */ - size_t limit_rate_after; /* limit_rate_after */ + ngx_http_complex_value_t *limit_rate_after; /* limit_rate_after */ size_t sendfile_max_chunk; /* sendfile_max_chunk */ size_t read_ahead; /* read_ahead */ size_t subrequest_output_buffer_size; diff -r 70c6b08973a0 -r 1a8327b50f78 src/http/ngx_http_write_filter_module.c --- a/src/http/ngx_http_write_filter_module.c Fri Aug 10 21:54:46 2018 +0300 +++ b/src/http/ngx_http_write_filter_module.c Tue Aug 14 08:15:59 2018 +0000 @@ -220,7 +220,26 @@ if (r->limit_rate) { if (r->limit_rate_after == 0) { - r->limit_rate_after = clcf->limit_rate_after; + r->limit_rate_after = 0; + + if (clcf->limit_rate_after != NULL) { + ngx_str_t res; + size_t st; + + if (ngx_http_complex_value(r, clcf->limit_rate_after, &res) + != NGX_OK) + { + return NGX_ERROR; + } + + st = ngx_parse_size(&res); + if (st != (size_t) NGX_ERROR) { + r->limit_rate_after = st; + } else { + ngx_log_error(NGX_LOG_ALERT, c->log, 0, + "limit_rate_after has bad value"); + } + } } limit = (off_t) r->limit_rate * (ngx_time() - r->start_sec + 1)

3 years, 5 months

[PATCH] Upstream: added $upstream_bytes_sent variable

by Piotr Sikora

# HG changeset patch # User Piotr Sikora <piotrsikora(a)google.com> # Date 1494129075 25200 # Sat May 06 20:51:15 2017 -0700 # Node ID fafbb3ee41e5bb03bcfba73f7d4367b8ab7d36cc # Parent be5cb9c67c05ccaf22dab7abba78aa4c1545a8ee Upstream: added $upstream_bytes_sent variable. Signed-off-by: Piotr Sikora <piotrsikora(a)google.com> diff -r be5cb9c67c05 -r fafbb3ee41e5 src/http/ngx_http_upstream.c --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -162,8 +162,8 @@ static ngx_int_t ngx_http_upstream_statu ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_upstream_response_time_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); -static ngx_int_t ngx_http_upstream_response_length_variable( - ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_http_upstream_bytes_variable(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_upstream_header_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_upstream_trailer_variable(ngx_http_request_t *r, @@ -402,11 +402,15 @@ static ngx_http_variable_t ngx_http_ups NGX_HTTP_VAR_NOCACHEABLE, 0 }, { ngx_string("upstream_response_length"), NULL, - ngx_http_upstream_response_length_variable, 0, + ngx_http_upstream_bytes_variable, 0, NGX_HTTP_VAR_NOCACHEABLE, 0 }, { ngx_string("upstream_bytes_received"), NULL, - ngx_http_upstream_response_length_variable, 1, + ngx_http_upstream_bytes_variable, 1, + NGX_HTTP_VAR_NOCACHEABLE, 0 }, + + { ngx_string("upstream_bytes_sent"), NULL, + ngx_http_upstream_bytes_variable, 2, NGX_HTTP_VAR_NOCACHEABLE, 0 }, #if (NGX_HTTP_CACHE) @@ -4134,6 +4138,10 @@ ngx_http_upstream_next(ngx_http_request_ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http next upstream, %xi", ft_type); + if (u->state && u->state->bytes_sent == 0 && u->peer.connection) { + u->state->bytes_sent = u->peer.connection->sent; + } + if (u->peer.sockaddr) { if (ft_type == NGX_HTTP_UPSTREAM_FT_HTTP_403 @@ -4319,6 +4327,10 @@ ngx_http_upstream_finalize_request(ngx_h - u->pipe->preread_size; u->state->response_length = u->pipe->read_length; } + + if (u->state->bytes_sent == 0 && u->peer.connection) { + u->state->bytes_sent = u->peer.connection->sent; + } } u->finalize_request(r, rc); @@ -5468,7 +5480,7 @@ ngx_http_upstream_response_time_variable static ngx_int_t -ngx_http_upstream_response_length_variable(ngx_http_request_t *r, +ngx_http_upstream_bytes_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) { u_char *p; @@ -5499,7 +5511,10 @@ ngx_http_upstream_response_length_variab for ( ;; ) { - if (data == 1) { + if (data == 2) { + p = ngx_sprintf(p, "%O", state[i].bytes_sent); + + } else if (data == 1) { p = ngx_sprintf(p, "%O", state[i].bytes_received); } else { diff -r be5cb9c67c05 -r fafbb3ee41e5 src/http/ngx_http_upstream.h --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -64,6 +64,7 @@ typedef struct { ngx_msec_t queue_time; off_t response_length; off_t bytes_received; + off_t bytes_sent; ngx_str_t *peer; } ngx_http_upstream_state_t;

3 years, 8 months

Patch to make 404 pages etc and autoindex pages use valid HTML

by Andras Farkas

Hello! The following two patches make it so that whenever nginx provides an autoindexed page or a special response page, the HTML page sent uses valid HTML. This means browsers will use a standards-compliant mode rather than quirks mode to render those pages. Thanks for reading!

3 years, 8 months

[PATCH] HTTP/2: fixed handling of fully preread request bodies

by Piotr Sikora

# HG changeset patch # User Piotr Sikora <piotrsikora(a)google.com> # Date 1540435636 25200 # Wed Oct 24 19:47:16 2018 -0700 # Node ID 466c154c5c53b956660211df96331b3c25669485 # Parent be5cb9c67c05ccaf22dab7abba78aa4c1545a8ee HTTP/2: fixed handling of fully preread request bodies. Previously, fully preread request body of a request without the "Content-Length" header was always written to a temporary file. Reported by Wayne Zhang. Signed-off-by: Piotr Sikora <piotrsikora(a)google.com> diff -r be5cb9c67c05 -r 466c154c5c53 src/http/v2/ngx_http_v2.c --- a/src/http/v2/ngx_http_v2.c +++ b/src/http/v2/ngx_http_v2.c @@ -3863,6 +3863,12 @@ ngx_http_v2_read_request_body(ngx_http_r { rb->buf = ngx_create_temp_buf(r->pool, (size_t) len); + } else if (len < 0 && stream->in_closed && stream->preread + && !r->request_body_in_file_only) + { + rb->buf = ngx_create_temp_buf(r->pool, + (size_t) ngx_buf_size(stream->preread)); + } else { rb->buf = ngx_calloc_buf(r->pool);

3 years, 8 months

[PATCH] Mail: nginx_error:cache file has too long header

by Yongguang Bai

# HG changeset patch # User Yongguang Bai <yongguang.bai(a)quantil.com> # Date 1543276278 28800 # Mon Nov 26 15:51:18 2018 -0800 # Node ID 4d48e1f3ebf6f0634e8e2cbd057d9fcfbea9d988 # Parent a7ff19afbb14795fef14f599a304d0ad21052b70 Mail: nginx_error:cache file has too long header This error is printed when cached file is expired and the response is changed in proxied server, and Nginx is under heavy load. diff -r a7ff19afbb14 -r 4d48e1f3ebf6 src/http/ngx_http_file_cache.c --- a/src/http/ngx_http_file_cache.c Mon Nov 26 18:29:56 2018 +0300 +++ b/src/http/ngx_http_file_cache.c Mon Nov 26 15:51:18 2018 -0800 @@ -376,6 +376,10 @@ ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http file cache fd: %d", of.fd); + if(c->uniq != of.uniq){ + c->body_start = ngx_pagesize; + } + c->file.fd = of.fd; c->file.log = r->connection->log; c->uniq = of.uniq;

3 years, 8 months

[njs] Fixed comparison of Byte and UTF8 strings.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/e713f648ef71 branches: changeset: 680:e713f648ef71 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Fri Nov 30 17:52:02 2018 +0300 description: Fixed comparison of Byte and UTF8 strings. diffstat: njs/njs_vm.c | 22 +++++++++++++++++----- njs/test/njs_unit_test.c | 21 ++++++++++++++++++++- 2 files changed, 37 insertions(+), 6 deletions(-) diffs (98 lines): diff -r 83b64328fbb2 -r e713f648ef71 njs/njs_vm.c --- a/njs/njs_vm.c Thu Nov 29 21:01:59 2018 +0300 +++ b/njs/njs_vm.c Fri Nov 30 17:52:02 2018 +0300 @@ -1712,7 +1712,7 @@ njs_vmcode_strict_not_equal(njs_vm_t *vm nxt_noinline nxt_bool_t njs_values_strict_equal(const njs_value_t *val1, const njs_value_t *val2) { - size_t size; + size_t size, length1, length2; const u_char *start1, *start2; if (val1->type != val2->type) { @@ -1737,7 +1737,14 @@ njs_values_strict_equal(const njs_value_ } if (size != NJS_STRING_LONG) { - if (val1->short_string.length != val2->short_string.length) { + length1 = val1->short_string.length; + length2 = val2->short_string.length; + + /* + * Using full memcmp() comparison if at least one string + * is a Byte string. + */ + if (length1 != 0 && length2 != 0 && length1 != length2) { return 0; } @@ -1751,9 +1758,14 @@ njs_values_strict_equal(const njs_value_ return 0; } - if (val1->long_string.data->length - != val2->long_string.data->length) - { + length1 = val1->long_string.data->length; + length2 = val2->long_string.data->length; + + /* + * Using full memcmp() comparison if at least one string + * is a Byte string. + */ + if (length1 != 0 && length2 != 0 && length1 != length2) { return 0; } diff -r 83b64328fbb2 -r e713f648ef71 njs/test/njs_unit_test.c --- a/njs/test/njs_unit_test.c Thu Nov 29 21:01:59 2018 +0300 +++ b/njs/test/njs_unit_test.c Fri Nov 30 17:52:02 2018 +0300 @@ -2337,6 +2337,16 @@ static njs_unit_test_t njs_test[] = "} a"), nxt_string("A123DT") }, + { nxt_string("var t; " + "switch ($r3.uri) {" + "case 'abc': " + " t='A'; " + " break; " + "default: " + " t='F'; " + "}; t"), + nxt_string("A") }, + /* continue. */ { nxt_string("continue"), @@ -4045,7 +4055,7 @@ static njs_unit_test_t njs_test[] = nxt_string("true") }, { nxt_string("'\\u00CE\\u00B1'.toBytes() === 'α'"), - nxt_string("false") }, + nxt_string("true") }, { nxt_string("var b = '\\u00C2\\u00B6'.toBytes(), u = b.fromUTF8();" "b.length +' '+ b +' '+ u.length +' '+ u"), @@ -4087,6 +4097,12 @@ static njs_unit_test_t njs_test[] = { nxt_string("var a = '\\xB5\\xA7\\xB1\\xAE'.toBytes(); a.fromBytes(1, 3)"), nxt_string("§±") }, + { nxt_string("'A'.repeat(8).toBytes() === 'A'.repeat(8)"), + nxt_string("true") }, + + { nxt_string("'A'.repeat(16).toBytes() === 'A'.repeat(16)"), + nxt_string("true") }, + { nxt_string("var a = 'abcdefgh'; a.substr(3, 15)"), nxt_string("defgh") }, @@ -4476,6 +4492,9 @@ static njs_unit_test_t njs_test[] = { nxt_string("var o = {b:$r.props.b}; o.b"), nxt_string("42") }, + { nxt_string("$r2.uri == 'αβγ' && $r2.uri === 'αβγ'"), + nxt_string("true") }, + /**/ { nxt_string("'абвгдеёжзийклмнопрстуфхцчшщъыьэюя'.charCodeAt(5)"),

3 years, 8 months

[njs] Improved accuracy of console.time()/console.timeEnd().

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/b7706e03babc branches: changeset: 678:b7706e03babc user: Artem S. Povalyukhin <artem.povaluhin(a)gmail.com> date: Wed Nov 28 21:56:19 2018 +0300 description: Improved accuracy of console.time()/console.timeEnd(). diffstat: njs/njs_shell.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diffs (58 lines): diff -r 2ad7533bcbae -r b7706e03babc njs/njs_shell.c --- a/njs/njs_shell.c Wed Nov 28 21:50:28 2018 +0300 +++ b/njs/njs_shell.c Wed Nov 28 21:56:19 2018 +0300 @@ -153,7 +153,7 @@ static njs_external_t njs_externals[] = static njs_completion_t njs_completion; -static struct timeval njs_console_time; +static uint64_t njs_console_time = UINT64_MAX; int @@ -781,7 +781,7 @@ njs_ext_console_time(njs_vm_t *vm, njs_v vm->retval = njs_value_void; - gettimeofday(&njs_console_time, NULL); + njs_console_time = nxt_time(); return NJS_OK; } @@ -791,28 +791,25 @@ static njs_ret_t njs_ext_console_time_end(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, njs_index_t unused) { - int64_t us, ms; - struct timeval tv; + uint64_t ns, ms; - gettimeofday(&tv, NULL); + ns = nxt_time(); if (!njs_value_is_void(njs_arg(args, nargs, 1))) { njs_vm_error(vm, "labels not implemented"); return NJS_ERROR; } - if (nxt_fast_path(njs_console_time.tv_sec || njs_console_time.tv_usec)) { + if (nxt_fast_path(njs_console_time != UINT64_MAX)) { - us = ((int64_t) tv.tv_sec - njs_console_time.tv_sec) * 1000000 - + ((int64_t) tv.tv_usec - njs_console_time.tv_usec); + ns = ns - njs_console_time; - ms = us / 1000; - us = us % 1000; + ms = ns / 1000000; + ns = ns % 1000000; - printf("default: %" PRIu64 ".%03" PRIu64 "ms\n", ms, us); + printf("default: %" PRIu64 ".%06" PRIu64 "ms\n", ms, ns); - njs_console_time.tv_sec = 0; - njs_console_time.tv_usec = 0; + njs_console_time = UINT64_MAX; } else { printf("Timer \"default\" doesn’t exist.\n");

3 years, 8 months

[njs] Using acosh(0) to get NaN in runtime.

by Dmitry Volyntsev

details: https://hg.nginx.org/njs/rev/83b64328fbb2 branches: changeset: 679:83b64328fbb2 user: Dmitry Volyntsev <xeioex(a)nginx.com> date: Thu Nov 29 21:01:59 2018 +0300 description: Using acosh(0) to get NaN in runtime. macOS clang 10 optimizes sqrt(-1) out using garbage value instead. diffstat: nxt/auto/clang | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b7706e03babc -r 83b64328fbb2 nxt/auto/clang --- a/nxt/auto/clang Wed Nov 28 21:56:19 2018 +0300 +++ b/nxt/auto/clang Thu Nov 29 21:01:59 2018 +0300 @@ -314,7 +314,7 @@ nxt_feature_test="#include <math.h> #include <stdint.h> int main(void) { - int64_t i64 = sqrt(-1); + int64_t i64 = acosh(0); printf(\"%x\", (uint32_t) i64); return 0; }"

3 years, 8 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel November 2018