nginx-devel April 2015

nginx-devel@nginx.org

25 participants
125 discussions

Fwd: Windows shmem fix: makes shared memory fully ASLR and DEP compliant (ea. cache zone, limit zone, etc.)

by Sergey Brester

Hi, enclosed you will find an attached changeset, that fixes a ASLR/DEP problem on windows platforms (example Win 7/2008 x64). To find shared addr offset with ASLR, we have successful used the same resp. similar solution on various open source projects (ex.: postgresql etc.). Also nginx with suggested patch works fine over 5 months in production on several machines (Win-2k8-R2). BTW(1): I have interest to fix a problem with multiple workers under windows (ex.: http://forum.nginx.org/read.php?2,188714,188714#msg-188714 [1]). @Maxim Dounin: can you possibly give me more information, what you mean here, resp. what it currently depends on (see http://forum.nginx.org/read.php?2,188714,212568#msg-212568 [2]). BTW(2): I would like to fix iocp under windows also. Thanks in advance for any information about. P.S. speak fluently russian and german... Regards, Serg G. Brester (sebres) ------------------------- Links: ------ [1] http://forum.nginx.org/read.php?2,188714,188714#msg-188714 [2] http://forum.nginx.org/read.php?2,188714,212568#msg-212568

7 years, 5 months

nginx http-core enhancement: named location in subrequests + directive use_location

by Sergey Brester

Hi, enclosed you will find an attached changeset, that: - allows to fast use of named location in sub requests, such as auth_request, etc. Currently no named location was possible in any sub requests, real (or internal) locations only. # now you can use named location in sub requests: # auth_request /auth_loc/; auth_request @auth_loc; - in addition, a second mini-commit (37d7786e7015) with new directive "use_location" as alias or replacement for "try_files" with no file argument and without checking the existence of file(s): # try_files "" @loc use_location @loc It was allready more times discussed (goto location, etc.). PS. If someone needs a git version of it: https://github.com/sebres/nginx/commits/hg-sb-mod [1] Regards, sebres. Links: ------ [1] https://github.com/sebres/nginx/commits/hg-sb-mod

7 years, 6 months

[PATCH] HTTP: gzip resources upstream has flagged as sdch encoded.

by Tom Thorogood

Hi, This is ultimately a pretty simply change. When an proxied resource has been sdch encoded, currently the gzip module refuses to run. This change causes gzip to run on sdch resources and ensures that gzip is appended to the Content-Encoding header, keeping the sdch flag. For a working sdch server implementation, see <https://github.com/baranov1ch/connect-sdch>. Regards, Tom Thorogood.

7 years, 7 months

Trying to understand benchmarking results

by Bill Appleton

Hi All, I ran some benchmarks on our DreamFactory product running on NGINX using Apache Benchmark DreamFactory is a REST API platform, but from a server point of view it should look more or less like a simple WordPress website see the graphical results here: www*.dreamfactory.com/publications/comparison.png <http://dreamfactory.com/publications/comparison.png>* the red lines show the average and maximum response time for 500 requests at different levels of concurrency running on a "medium" aws server with 1 CPU the blue lines show the average and maximum response time for 500 requests at different levels of concurrency running on a "large" aws server with 2 CPUs Does anyone know why at about 100 concurrent requests we start to see some requests taking much longer to finish? Is this too much work for the processor? The database is overloaded? There is some server setting that limits concurrency? I have also included one of the benchmark reports below, as you can see most of the requests are handled promptly but about 5% are deferred and take a much longer time.... Any help would be appreciated! Thanks, Bill Appleton www.dreamfactory.com Server Software: nginx Server Hostname: next.cloud.dreamfactory.com Server Port: 80 Document Length: 126 bytes Concurrency Level: 200 Time taken for tests: 16.147 seconds Complete requests: 500 Failed requests: 0 Non-2xx responses: 500 Total transferred: 298000 bytes HTML transferred: 63000 bytes Requests per second: 30.97 [#/sec] (mean) Time per request: 6458.755 [ms] (mean) Time per request: 32.294 [ms] (mean, across all concurrent requests) Transfer rate: 18.02 [Kbytes/sec] received Connection Times (ms) min mean[+/-sd] median max Connect: 85 209 208.7 91 725 Processing: 146 3605 2629.2 3096 15633 Waiting: 145 3604 2629.2 3095 15633 Total: 243 3814 2725.4 3189 16143 Percentage of the requests served within a certain time (ms) 50% 3189 66% 3264 75% 3831 80% 4175 90% 6766 95% 10568 98% 11114 99% 16069 100% 16143 (longest request)

7 years, 7 months

Client disconnect in ngx_http_image_filter_module

by Dan Podeanu

I have encountered a bug in ngx_http_image_filter_module when used in conjunction with ngx_http_proxy_module ; the configuration is as following: location /img/ { proxy_pass http://mybucket.s3.amazonaws.com <http://mybucket.s3.amazonaws.com/>; image_filter resize 150 100; } The steps to reproduce are rather complicated as they depend on how TCP fragments the response coming from the proxy: - If http://mybucket.s3.amazonaws.com <http://mybucket.s3.amazonaws.com/> returns, in the first TCP packet, a sizable amount of data (1-2k), the image is resized correctly. - If http://mybucket.s3.amazonaws.com <http://mybucket.s3.amazonaws.com/> returns, in the first TCP packet, a small amount of data (HTTP header, or HTTP header + a few bytes), the content is marked as not an image and NGX_HTTP_UNSUPPORTED_MEDIA_TYPE is returned (disconnecting the client), irrespective on whether or not subsequent data would complete the response to a valid image. Nginx appears to give up right away on waiting for data if the contents of the first TCP packet received from the proxy does not contain a valid image header- i.e. ngx_http_image_test() will return NGX_HTTP_IMAGE_SIZE, etc. In my experience this was triggered by a subtle change in AWS S3 that fragments the TCP header more. Versions affected: 1.6.2, 1.6.3, 1.7.2, 1.8.0, etc. Attaching a patch which fixes it for my use case (1.6.2) below; the other versions can be fixed similarly: ———————————————————————— diff -ruN nginx-1.6.2.orig/src/http/modules/ngx_http_image_filter_module.c nginx-1.6.2/src/http/modules/ngx_http_image_filter_module.c --- nginx-1.6.2.orig/src/http/modules/ngx_http_image_filter_module.c 2014-09-16 19:23:19.000000000 +0700 +++ nginx-1.6.2/src/http/modules/ngx_http_image_filter_module.c 2015-04-28 16:25:47.000000000 +0700 @@ -317,9 +317,8 @@ } } - return ngx_http_filter_finalize_request(r, - &ngx_http_image_filter_module, - NGX_HTTP_UNSUPPORTED_MEDIA_TYPE); + /* wait to consume more data, do not give up on the request right away */ + return NGX_OK; } /* override content type */ ———————————————————————— Thoughts ? Is this the right fix ? Should I also post on the nginx Trac ? Thank you, Dan

7 years, 7 months

[PATCH] Cache: provide naive feedback loop for uncacheable URLs

by Piotr Sikora

# HG changeset patch # User Piotr Sikora <piotr(a)cloudflare.com> # Date 1430177825 25200 # Mon Apr 27 16:37:05 2015 -0700 # Node ID 1e7878138228e3decb868f38eddc38937d55f403 # Parent 96e22e4f1b03ff15a774c6ed34d74b897af32c55 Cache: provide naive feedback loop for uncacheable URLs. The cache lock provides a mechanism that allows only one request for the same URL to be sent upstream at the same time. All other requests must wait until the lock is released and/or not needed. While this works as designed and protects upstream from requests stampede in case the response is cacheable, it results in a huge performance degradation for popular and uncacheable URLs, thanks to the artificial delay added to the upstream requests. To make things even worse, the lock acquisition is retried every 500ms and prone to lock starvation - there is no queue, so newly accepted requests can jump ahead and acquire the lock before any of the already pending requests have a chance to retry it, which can lead to huge spikes in the response times and even timeouts. This feedback loop provides a mechanism that allows requests for uncacheable URLs to immediately skip the cache lock. Signed-off-by: Piotr Sikora <piotr(a)cloudflare.com> diff -r 96e22e4f1b03 -r 1e7878138228 src/http/ngx_http_cache.h --- a/src/http/ngx_http_cache.h Mon Apr 27 18:51:18 2015 +0300 +++ b/src/http/ngx_http_cache.h Mon Apr 27 16:37:05 2015 -0700 @@ -50,7 +50,8 @@ typedef struct { unsigned exists:1; unsigned updating:1; unsigned deleting:1; - /* 11 unused bits */ + unsigned cacheable:1; + /* 10 unused bits */ ngx_file_uniq_t uniq; time_t expire; @@ -171,7 +172,8 @@ ngx_int_t ngx_http_file_cache_set_header void ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf); void ngx_http_file_cache_update_header(ngx_http_request_t *r); ngx_int_t ngx_http_cache_send(ngx_http_request_t *); -void ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf); +void ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf, + ngx_uint_t cacheable); time_t ngx_http_file_cache_valid(ngx_array_t *cache_valid, ngx_uint_t status); char *ngx_http_file_cache_set_slot(ngx_conf_t *cf, ngx_command_t *cmd, diff -r 96e22e4f1b03 -r 1e7878138228 src/http/ngx_http_file_cache.c --- a/src/http/ngx_http_file_cache.c Mon Apr 27 18:51:18 2015 +0300 +++ b/src/http/ngx_http_file_cache.c Mon Apr 27 16:37:05 2015 -0700 @@ -399,6 +399,7 @@ static ngx_int_t ngx_http_file_cache_lock(ngx_http_request_t *r, ngx_http_cache_t *c) { ngx_msec_t now, timer; + ngx_uint_t cacheable; ngx_http_file_cache_t *cache; if (!c->lock) { @@ -412,6 +413,7 @@ ngx_http_file_cache_lock(ngx_http_reques ngx_shmtx_lock(&cache->shpool->mutex); timer = c->node->lock_time - now; + cacheable = c->node->cacheable; if (!c->node->updating || (ngx_msec_int_t) timer <= 0) { c->node->updating = 1; @@ -422,11 +424,11 @@ ngx_http_file_cache_lock(ngx_http_reques ngx_shmtx_unlock(&cache->shpool->mutex); - ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http file cache lock u:%d wt:%M", - c->updating, c->wait_time); - - if (c->updating) { + ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, + "http file cache lock u:%d c:%d wt:%M", + c->updating, cacheable, c->wait_time); + + if (c->updating || !cacheable) { return NGX_DECLINED; } @@ -880,6 +882,7 @@ renew: fcn->uniq = 0; fcn->body_start = 0; fcn->fs_size = 0; + fcn->cacheable = 1; done: @@ -1300,6 +1303,7 @@ ngx_http_file_cache_update_variant(ngx_h c->node->count--; c->node->updating = 0; + c->node->cacheable = 1; c->node = NULL; ngx_shmtx_unlock(&cache->shpool->mutex); @@ -1389,6 +1393,7 @@ ngx_http_file_cache_update(ngx_http_requ } c->node->updating = 0; + c->node->cacheable = 1; ngx_shmtx_unlock(&cache->shpool->mutex); } @@ -1578,7 +1583,8 @@ ngx_http_cache_send(ngx_http_request_t * void -ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf) +ngx_http_file_cache_free(ngx_http_cache_t *c, ngx_temp_file_t *tf, + ngx_uint_t cacheable) { ngx_http_file_cache_t *cache; ngx_http_file_cache_node_t *fcn; @@ -1599,6 +1605,7 @@ ngx_http_file_cache_free(ngx_http_cache_ if (c->updating && fcn->lock_time == c->lock_time) { fcn->updating = 0; + fcn->cacheable = cacheable; } if (c->error) { @@ -1609,7 +1616,9 @@ ngx_http_file_cache_free(ngx_http_cache_ fcn->valid_msec = c->valid_msec; } - } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1) { + } else if (!fcn->exists && fcn->count == 0 && c->min_uses == 1 + && (!c->lock || fcn->cacheable)) + { ngx_queue_remove(&fcn->queue); ngx_rbtree_delete(&cache->sh->rbtree, &fcn->node); ngx_slab_free_locked(cache->shpool, fcn); @@ -1658,7 +1667,7 @@ ngx_http_file_cache_cleanup(void *data) "stalled cache updating, error:%ui", c->error); } - ngx_http_file_cache_free(c, NULL); + ngx_http_file_cache_free(c, NULL, 1); } diff -r 96e22e4f1b03 -r 1e7878138228 src/http/ngx_http_upstream.c --- a/src/http/ngx_http_upstream.c Mon Apr 27 18:51:18 2015 +0300 +++ b/src/http/ngx_http_upstream.c Mon Apr 27 16:37:05 2015 -0700 @@ -2353,7 +2353,8 @@ ngx_http_upstream_intercept_errors(ngx_h r->cache->error = status; } - ngx_http_file_cache_free(r->cache, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file, + u->cacheable); } #endif ngx_http_upstream_finalize_request(r, u, status); @@ -2835,7 +2836,7 @@ ngx_http_upstream_send_response(ngx_http "http cacheable: %d", u->cacheable); if (u->cacheable == 0 && r->cache) { - ngx_http_file_cache_free(r->cache, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file, 0); } #endif @@ -3643,11 +3644,11 @@ ngx_http_upstream_process_request(ngx_ht ngx_http_file_cache_update(r, tf); } else { - ngx_http_file_cache_free(r->cache, tf); + ngx_http_file_cache_free(r->cache, tf, 1); } } else if (p->upstream_error) { - ngx_http_file_cache_free(r->cache, p->temp_file); + ngx_http_file_cache_free(r->cache, p->temp_file, 1); } } @@ -4029,7 +4030,7 @@ ngx_http_upstream_finalize_request(ngx_h } } - ngx_http_file_cache_free(r->cache, u->pipe->temp_file); + ngx_http_file_cache_free(r->cache, u->pipe->temp_file, u->cacheable); } #endif

7 years, 7 months

[nginx] Configure: handle deprecated options.

by Ruslan Ermilov

details: http://hg.nginx.org/nginx/rev/162b2d27d4e1 branches: changeset: 6143:162b2d27d4e1 user: Ruslan Ermilov <ru(a)nginx.com> date: Wed Apr 29 14:59:02 2015 +0300 description: Configure: handle deprecated options. Removed the deprecated --without-http_limit_zone_module option. Deprecated the --with-imap and --with-imap_ssl_module options. diffstat: auto/options | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diffs (37 lines): diff -r 53bccdc4923a -r 162b2d27d4e1 auto/options --- a/auto/options Wed Apr 29 13:53:24 2015 +0300 +++ b/auto/options Wed Apr 29 14:59:02 2015 +0300 @@ -243,12 +243,6 @@ do --without-http_uwsgi_module) HTTP_UWSGI=NO ;; --without-http_scgi_module) HTTP_SCGI=NO ;; --without-http_memcached_module) HTTP_MEMCACHED=NO ;; - --without-http_limit_zone_module) - HTTP_LIMIT_CONN=NO - NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG -$0: warning: the \"--without-http_limit_zone_module\" option is deprecated, \ -use the \"--without-http_limit_conn_module\" option instead" - ;; --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO ;; --without-http_limit_req_module) HTTP_LIMIT_REQ=NO ;; --without-http_empty_gif_module) HTTP_EMPTY_GIF=NO ;; @@ -270,8 +264,18 @@ use the \"--without-http_limit_conn_modu --with-mail) MAIL=YES ;; --with-mail_ssl_module) MAIL_SSL=YES ;; # STUB - --with-imap) MAIL=YES ;; - --with-imap_ssl_module) MAIL_SSL=YES ;; + --with-imap) + MAIL=YES + NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG +$0: warning: the \"--with-imap\" option is deprecated, \ +use the \"--with-mail\" option instead" + ;; + --with-imap_ssl_module) + MAIL_SSL=YES + NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG +$0: warning: the \"--with-imap_ssl_module\" option is deprecated, \ +use the \"--with-mail_ssl_module\" option instead" + ;; --without-mail_pop3_module) MAIL_POP3=NO ;; --without-mail_imap_module) MAIL_IMAP=NO ;; --without-mail_smtp_module) MAIL_SMTP=NO ;;

7 years, 7 months

[nginx] Removed the deprecated "imap" directive.

by Ruslan Ermilov

details: http://hg.nginx.org/nginx/rev/53bccdc4923a branches: changeset: 6142:53bccdc4923a user: Ruslan Ermilov <ru(a)nginx.com> date: Wed Apr 29 13:53:24 2015 +0300 description: Removed the deprecated "imap" directive. diffstat: src/mail/ngx_mail.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diffs (30 lines): diff -r bf1655ae9a1c -r 53bccdc4923a src/mail/ngx_mail.c --- a/src/mail/ngx_mail.c Wed Apr 29 13:53:08 2015 +0300 +++ b/src/mail/ngx_mail.c Wed Apr 29 13:53:24 2015 +0300 @@ -36,13 +36,6 @@ static ngx_command_t ngx_mail_commands[ 0, NULL }, - { ngx_string("imap"), - NGX_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, - ngx_mail_block, - 0, - 0, - NULL }, - ngx_null_command }; @@ -83,12 +76,6 @@ ngx_mail_block(ngx_conf_t *cf, ngx_comma ngx_mail_core_srv_conf_t **cscfp; ngx_mail_core_main_conf_t *cmcf; - if (cmd->name.data[0] == 'i') { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, - "the \"imap\" directive is deprecated, " - "use the \"mail\" directive instead"); - } - /* the main mail context */ ctx = ngx_pcalloc(cf->pool, sizeof(ngx_mail_conf_ctx_t));

7 years, 7 months

[nginx] Removed the deprecated "so_keepalive" directive.

by Ruslan Ermilov

details: http://hg.nginx.org/nginx/rev/bf1655ae9a1c branches: changeset: 6141:bf1655ae9a1c user: Ruslan Ermilov <ru(a)nginx.com> date: Wed Apr 29 13:53:08 2015 +0300 description: Removed the deprecated "so_keepalive" directive. diffstat: src/mail/ngx_mail.h | 2 -- src/mail/ngx_mail_core_module.c | 16 ---------------- src/mail/ngx_mail_proxy_module.c | 13 ------------- 3 files changed, 0 insertions(+), 31 deletions(-) diffs (89 lines): diff -r 2911b7e5491b -r bf1655ae9a1c src/mail/ngx_mail.h --- a/src/mail/ngx_mail.h Wed Apr 29 13:52:49 2015 +0300 +++ b/src/mail/ngx_mail.h Wed Apr 29 13:53:08 2015 +0300 @@ -131,8 +131,6 @@ typedef struct { ngx_msec_t timeout; ngx_msec_t resolver_timeout; - ngx_flag_t so_keepalive; - ngx_str_t server_name; u_char *file_name; diff -r 2911b7e5491b -r bf1655ae9a1c src/mail/ngx_mail_core_module.c --- a/src/mail/ngx_mail_core_module.c Wed Apr 29 13:52:49 2015 +0300 +++ b/src/mail/ngx_mail_core_module.c Wed Apr 29 13:53:08 2015 +0300 @@ -27,12 +27,6 @@ static char *ngx_mail_core_resolver(ngx_ void *conf); -static ngx_conf_deprecated_t ngx_conf_deprecated_so_keepalive = { - ngx_conf_deprecated, "so_keepalive", - "so_keepalive\" parameter of the \"listen" -}; - - static ngx_command_t ngx_mail_core_commands[] = { { ngx_string("server"), @@ -56,13 +50,6 @@ static ngx_command_t ngx_mail_core_comm 0, NULL }, - { ngx_string("so_keepalive"), - NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_MAIL_SRV_CONF_OFFSET, - offsetof(ngx_mail_core_srv_conf_t, so_keepalive), - &ngx_conf_deprecated_so_keepalive }, - { ngx_string("timeout"), NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -175,7 +162,6 @@ ngx_mail_core_create_srv_conf(ngx_conf_t cscf->timeout = NGX_CONF_UNSET_MSEC; cscf->resolver_timeout = NGX_CONF_UNSET_MSEC; - cscf->so_keepalive = NGX_CONF_UNSET; cscf->resolver = NGX_CONF_UNSET_PTR; @@ -196,8 +182,6 @@ ngx_mail_core_merge_srv_conf(ngx_conf_t ngx_conf_merge_msec_value(conf->resolver_timeout, prev->resolver_timeout, 30000); - ngx_conf_merge_value(conf->so_keepalive, prev->so_keepalive, 0); - ngx_conf_merge_str_value(conf->server_name, prev->server_name, ""); diff -r 2911b7e5491b -r bf1655ae9a1c src/mail/ngx_mail_proxy_module.c --- a/src/mail/ngx_mail_proxy_module.c Wed Apr 29 13:52:49 2015 +0300 +++ b/src/mail/ngx_mail_proxy_module.c Wed Apr 29 13:53:08 2015 +0300 @@ -111,7 +111,6 @@ static u_char smtp_auth_ok[] = "235 2.0 void ngx_mail_proxy_init(ngx_mail_session_t *s, ngx_addr_t *peer) { - int keepalive; ngx_int_t rc; ngx_mail_proxy_ctx_t *p; ngx_mail_proxy_conf_t *pcf; @@ -121,18 +120,6 @@ ngx_mail_proxy_init(ngx_mail_session_t * cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); - if (cscf->so_keepalive) { - keepalive = 1; - - if (setsockopt(s->connection->fd, SOL_SOCKET, SO_KEEPALIVE, - (const void *) &keepalive, sizeof(int)) - == -1) - { - ngx_log_error(NGX_LOG_ALERT, s->connection->log, ngx_socket_errno, - "setsockopt(SO_KEEPALIVE) failed"); - } - } - p = ngx_pcalloc(s->connection->pool, sizeof(ngx_mail_proxy_ctx_t)); if (p == NULL) { ngx_mail_session_internal_server_error(s);

7 years, 7 months

[nginx] Removed deprecated HTTP directives.

by Ruslan Ermilov

details: http://hg.nginx.org/nginx/rev/2911b7e5491b branches: changeset: 6140:2911b7e5491b user: Ruslan Ermilov <ru(a)nginx.com> date: Wed Apr 29 13:52:49 2015 +0300 description: Removed deprecated HTTP directives. diffstat: src/http/ngx_http_core_module.c | 33 --------------------------------- 1 files changed, 0 insertions(+), 33 deletions(-) diffs (64 lines): diff -r b19350b896bb -r 2911b7e5491b src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c Wed Apr 29 13:52:37 2015 +0300 +++ b/src/http/ngx_http_core_module.c Wed Apr 29 13:52:49 2015 +0300 @@ -96,18 +96,6 @@ static ngx_conf_post_t ngx_http_core_lo static ngx_conf_post_handler_pt ngx_http_core_pool_size_p = ngx_http_core_pool_size; -static ngx_conf_deprecated_t ngx_conf_deprecated_optimize_server_names = { - ngx_conf_deprecated, "optimize_server_names", "server_name_in_redirect" -}; - -static ngx_conf_deprecated_t ngx_conf_deprecated_open_file_cache_retest = { - ngx_conf_deprecated, "open_file_cache_retest", "open_file_cache_valid" -}; - -static ngx_conf_deprecated_t ngx_conf_deprecated_satisfy_any = { - ngx_conf_deprecated, "satisfy_any", "satisfy" -}; - static ngx_conf_enum_t ngx_http_core_request_body_in_file[] = { { ngx_string("off"), NGX_HTTP_REQUEST_BODY_FILE_OFF }, @@ -255,13 +243,6 @@ static ngx_command_t ngx_http_core_comm offsetof(ngx_http_core_srv_conf_t, large_client_header_buffers), NULL }, - { ngx_string("optimize_server_names"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_core_loc_conf_t, server_name_in_redirect), - &ngx_conf_deprecated_optimize_server_names }, - { ngx_string("ignore_invalid_headers"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_FLAG, ngx_conf_set_flag_slot, @@ -519,13 +500,6 @@ static ngx_command_t ngx_http_core_comm offsetof(ngx_http_core_loc_conf_t, satisfy), &ngx_http_core_satisfy }, - { ngx_string("satisfy_any"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, - ngx_conf_set_flag_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_core_loc_conf_t, satisfy), - &ngx_conf_deprecated_satisfy_any }, - { ngx_string("internal"), NGX_HTTP_LOC_CONF|NGX_CONF_NOARGS, ngx_http_core_internal, @@ -689,13 +663,6 @@ static ngx_command_t ngx_http_core_comm offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), NULL }, - { ngx_string("open_file_cache_retest"), - NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, - ngx_conf_set_sec_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(ngx_http_core_loc_conf_t, open_file_cache_valid), - &ngx_conf_deprecated_open_file_cache_retest }, - { ngx_string("open_file_cache_min_uses"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_num_slot,

7 years, 7 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel April 2015