details: http://hg.nginx.org/nginx/rev/06cf0c4b8618
branches:
changeset: 7238:06cf0c4b8618
user: Ruslan Ermilov <ru@nginx.com>
date: Mon Mar 19 16:22:09 2018 +0300
description:
Upstream: fixed comments after 13f8dec720b5.

The fields "uri", "location", and "url" from ngx_http_upstream_conf_t
moved to ngx_http_proxy_loc_conf_t and ngx_http_proxy_vars_t, reflect
this change in create_loc_conf comments.

diffstat:

src/http/modules/ngx_http_fastcgi_module.c | 2 --
src/http/modules/ngx_http_memcached_module.c | 2 --
src/http/modules/ngx_http_proxy_module.c | 4 ++--
3 files changed, 2 insertions(+), 6 deletions(-)

diffs (43 lines):

diff -r d87393919a10 -r 06cf0c4b8618 src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Mon Mar 19 12:41:36 2018 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c Mon Mar 19 16:22:09 2018 +0300
@@ -2706,8 +2706,6 @@ ngx_http_fastcgi_create_loc_conf(ngx_con
* conf->upstream.cache_methods = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
- * conf->upstream.uri = { 0, NULL };
- * conf->upstream.location = NULL;
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
*
diff -r d87393919a10 -r 06cf0c4b8618 src/http/modules/ngx_http_memcached_module.c
--- a/src/http/modules/ngx_http_memcached_module.c Mon Mar 19 12:41:36 2018 +0300
+++ b/src/http/modules/ngx_http_memcached_module.c Mon Mar 19 16:22:09 2018 +0300
@@ -592,8 +592,6 @@ ngx_http_memcached_create_loc_conf(ngx_c
* conf->upstream.bufs.num = 0;
* conf->upstream.next_upstream = 0;
* conf->upstream.temp_path = NULL;
- * conf->upstream.uri = { 0, NULL };
- * conf->upstream.location = NULL;
*/

conf->upstream.local = NGX_CONF_UNSET_PTR;
diff -r d87393919a10 -r 06cf0c4b8618 src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c Mon Mar 19 12:41:36 2018 +0300
+++ b/src/http/modules/ngx_http_proxy_module.c Mon Mar 19 16:22:09 2018 +0300
@@ -2797,13 +2797,13 @@ ngx_http_proxy_create_loc_conf(ngx_conf_
* conf->upstream.cache_methods = 0;
* conf->upstream.temp_path = NULL;
* conf->upstream.hide_headers_hash = { NULL, 0 };
- * conf->upstream.uri = { 0, NULL };
- * conf->upstream.location = NULL;
* conf->upstream.store_lengths = NULL;
* conf->upstream.store_values = NULL;
* conf->upstream.ssl_name = NULL;
*
* conf->method = NULL;
+ * conf->location = NULL;
+ * conf->url = { 0, NULL };
* conf->headers_source = NULL;
* conf->headers.lengths = NULL;
* conf->headers.values = NULL;
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel