mirror of https://github.com/openresty/openresty
Merge branch 'openresty:master' into add-ssl-client-hello-cb-yield-patch
catbro666
4 years ago
committed by
GitHub
commit
40cef15e59
@ -0,0 +1,53 @@
|
||||
diff --git a/src/core/nginx.c b/src/core/nginx.c
|
||||
index 2e8b692..104d96e 100644
|
||||
--- a/src/core/nginx.c
|
||||
+++ b/src/core/nginx.c
|
||||
@@ -1029,6 +1029,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
|
||||
ccf->daemon = NGX_CONF_UNSET;
|
||||
ccf->master = NGX_CONF_UNSET;
|
||||
ccf->privileged_agent = NGX_CONF_UNSET;
|
||||
+ ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
|
||||
ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
|
||||
ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
|
||||
|
||||
@@ -1059,6 +1060,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
|
||||
ngx_conf_init_value(ccf->daemon, 1);
|
||||
ngx_conf_init_value(ccf->master, 1);
|
||||
ngx_conf_init_value(ccf->privileged_agent, 0);
|
||||
+ ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
|
||||
ngx_conf_init_msec_value(ccf->timer_resolution, 0);
|
||||
ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
|
||||
|
||||
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
|
||||
index e9239ae..af9406e 100644
|
||||
--- a/src/core/ngx_cycle.h
|
||||
+++ b/src/core/ngx_cycle.h
|
||||
@@ -92,6 +92,7 @@ typedef struct {
|
||||
ngx_flag_t daemon;
|
||||
ngx_flag_t master;
|
||||
ngx_flag_t privileged_agent;
|
||||
+ ngx_uint_t privileged_agent_connections;
|
||||
|
||||
ngx_msec_t timer_resolution;
|
||||
ngx_msec_t shutdown_timeout;
|
||||
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||
index b1eb322..8e03696 100644
|
||||
--- a/src/os/unix/ngx_process_cycle.c
|
||||
+++ b/src/os/unix/ngx_process_cycle.c
|
||||
@@ -1208,6 +1208,7 @@ static void
|
||||
ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||
{
|
||||
char *name = data;
|
||||
+ ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
||||
|
||||
/*
|
||||
* Set correct process type since closing listening Unix domain socket
|
||||
@@ -1219,7 +1220,7 @@ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||
ngx_close_listening_sockets(cycle);
|
||||
|
||||
/* Set a moderate number of connections for a helper process. */
|
||||
- cycle->connection_n = 512;
|
||||
+ cycle->connection_n = ccf->privileged_agent_connections;
|
||||
|
||||
ngx_worker_process_init(cycle, -1);
|
||||
|
||||
@ -0,0 +1,53 @@
|
||||
diff --git a/src/core/nginx.c b/src/core/nginx.c
|
||||
index 269ff84..48329bd 100644
|
||||
--- a/src/core/nginx.c
|
||||
+++ b/src/core/nginx.c
|
||||
@@ -1062,6 +1062,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
|
||||
ccf->daemon = NGX_CONF_UNSET;
|
||||
ccf->master = NGX_CONF_UNSET;
|
||||
ccf->privileged_agent = NGX_CONF_UNSET;
|
||||
+ ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
|
||||
ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
|
||||
ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
|
||||
|
||||
@@ -1092,6 +1093,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
|
||||
ngx_conf_init_value(ccf->daemon, 1);
|
||||
ngx_conf_init_value(ccf->master, 1);
|
||||
ngx_conf_init_value(ccf->privileged_agent, 0);
|
||||
+ ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
|
||||
ngx_conf_init_msec_value(ccf->timer_resolution, 0);
|
||||
ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
|
||||
|
||||
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
|
||||
index 6a9583e..4469390 100644
|
||||
--- a/src/core/ngx_cycle.h
|
||||
+++ b/src/core/ngx_cycle.h
|
||||
@@ -93,6 +93,7 @@ typedef struct {
|
||||
ngx_flag_t daemon;
|
||||
ngx_flag_t master;
|
||||
ngx_flag_t privileged_agent;
|
||||
+ ngx_uint_t privileged_agent_connections;
|
||||
|
||||
ngx_msec_t timer_resolution;
|
||||
ngx_msec_t shutdown_timeout;
|
||||
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||
index df25f9d..bd259c1 100644
|
||||
--- a/src/os/unix/ngx_process_cycle.c
|
||||
+++ b/src/os/unix/ngx_process_cycle.c
|
||||
@@ -1179,6 +1179,7 @@ static void
|
||||
ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||
{
|
||||
char *name = data;
|
||||
+ ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
||||
|
||||
/*
|
||||
* Set correct process type since closing listening Unix domain socket
|
||||
@@ -1190,7 +1191,7 @@ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||
ngx_close_listening_sockets(cycle);
|
||||
|
||||
/* Set a moderate number of connections for a helper process. */
|
||||
- cycle->connection_n = 512;
|
||||
+ cycle->connection_n = ccf->privileged_agent_connections;
|
||||
|
||||
ngx_worker_process_init(cycle, -1);
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
--- redis-nginx-module-0.3.9/ngx_http_redis_module.c 2021-08-02 23:01:47.810190756 +0800
|
||||
+++ redis-nginx-module-0.3.9-patched/ngx_http_redis_module.c 2021-08-02 23:02:06.861317611 +0800
|
||||
@@ -1021,12 +1021,14 @@
|
||||
continue;
|
||||
}
|
||||
|
||||
+#if (nginx_version < 1011006)
|
||||
if (uscfp[i]->default_port
|
||||
&& url->default_port
|
||||
&& uscfp[i]->default_port != url->default_port)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
+#endif
|
||||
|
||||
return uscfp[i];
|
||||
}
|
||||
@ -0,0 +1,189 @@
|
||||
--- ngx_http_redis-0.3.9/ngx_http_redis_module.c 2021-08-02 22:22:48.769615464 +0800
|
||||
+++ ngx_http_redis-0.3.9-patched2/ngx_http_redis_module.c 2021-08-02 22:57:54.388636438 +0800
|
||||
@@ -24,6 +24,7 @@
|
||||
ngx_int_t db;
|
||||
ngx_int_t auth;
|
||||
ngx_uint_t gzip_flag;
|
||||
+ ngx_http_complex_value_t *complex_target; /* for redis_pass */
|
||||
} ngx_http_redis_loc_conf_t;
|
||||
|
||||
|
||||
@@ -50,6 +51,8 @@
|
||||
|
||||
static char *ngx_http_redis_pass(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||
void *conf);
|
||||
+static ngx_http_upstream_srv_conf_t *
|
||||
+ ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url);
|
||||
|
||||
static ngx_conf_bitmask_t ngx_http_redis_next_upstream_masks[] = {
|
||||
{ ngx_string("error"), NGX_HTTP_UPSTREAM_FT_ERROR },
|
||||
@@ -196,14 +199,46 @@
|
||||
#if defined nginx_version && nginx_version >= 8011
|
||||
if (ngx_http_upstream_create(r) != NGX_OK) {
|
||||
#else
|
||||
- rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
|
||||
-
|
||||
u = ngx_pcalloc(r->pool, sizeof(ngx_http_upstream_t));
|
||||
if (u == NULL) {
|
||||
#endif
|
||||
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
||||
}
|
||||
|
||||
+ rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
|
||||
+ if (rlcf->complex_target) {
|
||||
+ ngx_str_t target;
|
||||
+ ngx_url_t url;
|
||||
+
|
||||
+ /* variables used in the redis_pass directive */
|
||||
+
|
||||
+ if (ngx_http_complex_value(r, rlcf->complex_target, &target)
|
||||
+ != NGX_OK)
|
||||
+ {
|
||||
+ return NGX_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ if (target.len == 0) {
|
||||
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
+ "handler: empty \"redis_pass\" target");
|
||||
+ return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ url.host = target;
|
||||
+ url.port = 0;
|
||||
+ url.default_port = 6379;
|
||||
+ url.no_resolve = 1;
|
||||
+
|
||||
+ rlcf->upstream.upstream = ngx_http_redis_upstream_add(r, &url);
|
||||
+
|
||||
+ if (rlcf->upstream.upstream == NULL) {
|
||||
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
|
||||
+ "redis: upstream \"%V\" not found", &target);
|
||||
+
|
||||
+ return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
#if defined nginx_version && nginx_version >= 8011
|
||||
u = r->upstream;
|
||||
#endif
|
||||
@@ -222,9 +257,7 @@
|
||||
u->peer.log_error = NGX_ERROR_ERR;
|
||||
#endif
|
||||
|
||||
-#if defined nginx_version && nginx_version >= 8011
|
||||
- rlcf = ngx_http_get_module_loc_conf(r, ngx_http_redis_module);
|
||||
-#else
|
||||
+#if !defined nginx_version || nginx_version < 8011
|
||||
u->output.tag = (ngx_buf_tag_t) &ngx_http_redis_module;
|
||||
#endif
|
||||
|
||||
@@ -903,22 +936,13 @@
|
||||
ngx_url_t u;
|
||||
ngx_http_core_loc_conf_t *clcf;
|
||||
|
||||
+ ngx_int_t n;
|
||||
+ ngx_http_compile_complex_value_t ccv;
|
||||
+
|
||||
if (rlcf->upstream.upstream) {
|
||||
return "is duplicate";
|
||||
}
|
||||
|
||||
- value = cf->args->elts;
|
||||
-
|
||||
- ngx_memzero(&u, sizeof(ngx_url_t));
|
||||
-
|
||||
- u.url = value[1];
|
||||
- u.no_resolve = 1;
|
||||
-
|
||||
- rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
|
||||
- if (rlcf->upstream.upstream == NULL) {
|
||||
- return NGX_CONF_ERROR;
|
||||
- }
|
||||
-
|
||||
clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
|
||||
|
||||
clcf->handler = ngx_http_redis_handler;
|
||||
@@ -936,10 +956,83 @@
|
||||
rlcf->db = ngx_http_get_variable_index(cf, &ngx_http_redis_db);
|
||||
rlcf->auth = ngx_http_get_variable_index(cf, &ngx_http_redis_auth);
|
||||
|
||||
+ value = cf->args->elts;
|
||||
+
|
||||
+ n = ngx_http_script_variables_count(&value[1]);
|
||||
+ if (n) {
|
||||
+ rlcf->complex_target = ngx_palloc(cf->pool,
|
||||
+ sizeof(ngx_http_complex_value_t));
|
||||
+
|
||||
+ if (rlcf->complex_target == NULL) {
|
||||
+ return NGX_CONF_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
|
||||
+ ccv.cf = cf;
|
||||
+ ccv.value = &value[1];
|
||||
+ ccv.complex_value = rlcf->complex_target;
|
||||
+
|
||||
+ if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
|
||||
+ return NGX_CONF_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ return NGX_CONF_OK;
|
||||
+ }
|
||||
+
|
||||
+ rlcf->complex_target = NULL;
|
||||
+
|
||||
+ ngx_memzero(&u, sizeof(ngx_url_t));
|
||||
+
|
||||
+ u.url = value[1];
|
||||
+ u.no_resolve = 1;
|
||||
+
|
||||
+ rlcf->upstream.upstream = ngx_http_upstream_add(cf, &u, 0);
|
||||
+ if (rlcf->upstream.upstream == NULL) {
|
||||
+ return NGX_CONF_ERROR;
|
||||
+ }
|
||||
+
|
||||
return NGX_CONF_OK;
|
||||
}
|
||||
|
||||
|
||||
+static ngx_http_upstream_srv_conf_t *
|
||||
+ngx_http_redis_upstream_add(ngx_http_request_t *r, ngx_url_t *url)
|
||||
+{
|
||||
+ ngx_http_upstream_main_conf_t *umcf;
|
||||
+ ngx_http_upstream_srv_conf_t **uscfp;
|
||||
+ ngx_uint_t i;
|
||||
+
|
||||
+ umcf = ngx_http_get_module_main_conf(r, ngx_http_upstream_module);
|
||||
+
|
||||
+ uscfp = umcf->upstreams.elts;
|
||||
+
|
||||
+ for (i = 0; i < umcf->upstreams.nelts; i++) {
|
||||
+
|
||||
+ if (uscfp[i]->host.len != url->host.len
|
||||
+ || ngx_strncasecmp(uscfp[i]->host.data, url->host.data,
|
||||
+ url->host.len) != 0)
|
||||
+ {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ if (uscfp[i]->port != url->port) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ if (uscfp[i]->default_port
|
||||
+ && url->default_port
|
||||
+ && uscfp[i]->default_port != url->default_port)
|
||||
+ {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ return uscfp[i];
|
||||
+ }
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+
|
||||
static ngx_int_t
|
||||
ngx_http_redis_reset_variable(ngx_http_request_t *r,
|
||||
ngx_http_variable_value_t *v, uintptr_t data)
|
||||
Loading…
Reference in New Issue