[nginx] svn commit: r5009 - in trunk/src/http: . modules
ru at nginx.com
ru at nginx.com
Wed Jan 16 09:42:58 UTC 2013
Author: ru
Date: 2013-01-16 09:42:57 +0000 (Wed, 16 Jan 2013)
New Revision: 5009
URL: http://trac.nginx.org/nginx/changeset/5009/nginx
Log:
Fixed and improved the "*_bind" directives of proxying modules.
The "proxy_bind", "fastcgi_bind", "uwsgi_bind", "scgi_bind" and
"memcached_bind" directives are now inherited; inherited value
can be reset by the "off" parameter. Duplicate directives are
now detected. Parameter value can now contain variables.
Modified:
trunk/src/http/modules/ngx_http_fastcgi_module.c
trunk/src/http/modules/ngx_http_memcached_module.c
trunk/src/http/modules/ngx_http_proxy_module.c
trunk/src/http/modules/ngx_http_scgi_module.c
trunk/src/http/modules/ngx_http_uwsgi_module.c
trunk/src/http/ngx_http.h
trunk/src/http/ngx_http_upstream.c
trunk/src/http/ngx_http_upstream.h
Modified: trunk/src/http/modules/ngx_http_fastcgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_fastcgi_module.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/modules/ngx_http_fastcgi_module.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -2106,6 +2106,8 @@
conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+ conf->upstream.local = NGX_CONF_UNSET_PTR;
+
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
@@ -2177,6 +2179,9 @@
ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0);
+ ngx_conf_merge_ptr_value(conf->upstream.local,
+ prev->upstream.local, NULL);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
Modified: trunk/src/http/modules/ngx_http_memcached_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_memcached_module.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/modules/ngx_http_memcached_module.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -574,6 +574,7 @@
* conf->upstream.location = NULL;
*/
+ conf->upstream.local = NGX_CONF_UNSET_PTR;
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
@@ -607,6 +608,9 @@
ngx_http_memcached_loc_conf_t *prev = parent;
ngx_http_memcached_loc_conf_t *conf = child;
+ ngx_conf_merge_ptr_value(conf->upstream.local,
+ prev->upstream.local, NULL);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
Modified: trunk/src/http/modules/ngx_http_proxy_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_proxy_module.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/modules/ngx_http_proxy_module.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -2369,6 +2369,8 @@
conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+ conf->upstream.local = NGX_CONF_UNSET_PTR;
+
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
@@ -2453,6 +2455,9 @@
ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0);
+ ngx_conf_merge_ptr_value(conf->upstream.local,
+ prev->upstream.local, NULL);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
Modified: trunk/src/http/modules/ngx_http_scgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_scgi_module.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/modules/ngx_http_scgi_module.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -1067,6 +1067,8 @@
conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+ conf->upstream.local = NGX_CONF_UNSET_PTR;
+
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
@@ -1135,6 +1137,9 @@
ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0);
+ ngx_conf_merge_ptr_value(conf->upstream.local,
+ prev->upstream.local, NULL);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
Modified: trunk/src/http/modules/ngx_http_uwsgi_module.c
===================================================================
--- trunk/src/http/modules/ngx_http_uwsgi_module.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/modules/ngx_http_uwsgi_module.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -1104,6 +1104,8 @@
conf->upstream.buffering = NGX_CONF_UNSET;
conf->upstream.ignore_client_abort = NGX_CONF_UNSET;
+ conf->upstream.local = NGX_CONF_UNSET_PTR;
+
conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC;
conf->upstream.read_timeout = NGX_CONF_UNSET_MSEC;
@@ -1172,6 +1174,9 @@
ngx_conf_merge_value(conf->upstream.ignore_client_abort,
prev->upstream.ignore_client_abort, 0);
+ ngx_conf_merge_ptr_value(conf->upstream.local,
+ prev->upstream.local, NULL);
+
ngx_conf_merge_msec_value(conf->upstream.connect_timeout,
prev->upstream.connect_timeout, 60000);
Modified: trunk/src/http/ngx_http.h
===================================================================
--- trunk/src/http/ngx_http.h 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/ngx_http.h 2013-01-16 09:42:57 UTC (rev 5009)
@@ -28,11 +28,11 @@
#include <ngx_http_variables.h>
#include <ngx_http_request.h>
+#include <ngx_http_script.h>
#include <ngx_http_upstream.h>
#include <ngx_http_upstream_round_robin.h>
#include <ngx_http_config.h>
#include <ngx_http_busy_lock.h>
-#include <ngx_http_script.h>
#include <ngx_http_core_module.h>
#if (NGX_HTTP_CACHE)
Modified: trunk/src/http/ngx_http_upstream.c
===================================================================
--- trunk/src/http/ngx_http_upstream.c 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/ngx_http_upstream.c 2013-01-16 09:42:57 UTC (rev 5009)
@@ -134,6 +134,9 @@
static char *ngx_http_upstream_server(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
+static ngx_addr_t *ngx_http_upstream_get_local(ngx_http_request_t *r,
+ ngx_http_upstream_local_t *local);
+
static void *ngx_http_upstream_create_main_conf(ngx_conf_t *cf);
static char *ngx_http_upstream_init_main_conf(ngx_conf_t *cf, void *conf);
@@ -507,7 +510,7 @@
return;
}
- u->peer.local = u->conf->local;
+ u->peer.local = ngx_http_upstream_get_local(r, u->conf->local);
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
@@ -4474,24 +4477,63 @@
{
char *p = conf;
- ngx_int_t rc;
- ngx_str_t *value;
- ngx_addr_t **paddr;
+ ngx_int_t rc;
+ ngx_str_t *value;
+ ngx_http_complex_value_t cv;
+ ngx_http_upstream_local_t **plocal, *local;
+ ngx_http_compile_complex_value_t ccv;
- paddr = (ngx_addr_t **) (p + cmd->offset);
+ plocal = (ngx_http_upstream_local_t **) (p + cmd->offset);
- *paddr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
- if (*paddr == NULL) {
- return NGX_CONF_ERROR;
+ if (*plocal != NGX_CONF_UNSET_PTR) {
+ return "is duplicate";
}
value = cf->args->elts;
- rc = ngx_parse_addr(cf->pool, *paddr, value[1].data, value[1].len);
+ if (ngx_strcmp(value[1].data, "off") == 0) {
+ *plocal = NULL;
+ return NGX_CONF_OK;
+ }
+ ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+
+ ccv.cf = cf;
+ ccv.value = &value[1];
+ ccv.complex_value = &cv;
+
+ if (ngx_http_compile_complex_value(&ccv) != NGX_OK) {
+ return NGX_CONF_ERROR;
+ }
+
+ local = ngx_pcalloc(cf->pool, sizeof(ngx_http_upstream_local_t));
+ if (local == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ *plocal = local;
+
+ if (cv.lengths) {
+ local->value = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
+ if (local->value == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ *local->value = cv;
+
+ return NGX_CONF_OK;
+ }
+
+ local->addr = ngx_palloc(cf->pool, sizeof(ngx_addr_t));
+ if (local->addr == NULL) {
+ return NGX_CONF_ERROR;
+ }
+
+ rc = ngx_parse_addr(cf->pool, local->addr, value[1].data, value[1].len);
+
switch (rc) {
case NGX_OK:
- (*paddr)->name = value[1];
+ local->addr->name = value[1];
return NGX_CONF_OK;
case NGX_DECLINED:
@@ -4505,6 +4547,53 @@
}
+static ngx_addr_t *
+ngx_http_upstream_get_local(ngx_http_request_t *r,
+ ngx_http_upstream_local_t *local)
+{
+ ngx_int_t rc;
+ ngx_str_t val;
+ ngx_addr_t *addr;
+
+ if (local == NULL) {
+ return NULL;
+ }
+
+ if (local->value == NULL) {
+ return local->addr;
+ }
+
+ if (ngx_http_complex_value(r, local->value, &val) != NGX_OK) {
+ return NULL;
+ }
+
+ if (val.len == 0) {
+ return NULL;
+ }
+
+ addr = ngx_palloc(r->pool, sizeof(ngx_addr_t));
+ if (addr == NULL) {
+ return NULL;
+ }
+
+ rc = ngx_parse_addr(r->pool, addr, val.data, val.len);
+
+ switch (rc) {
+ case NGX_OK:
+ addr->name = val;
+ return addr;
+
+ case NGX_DECLINED:
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+ "invalid local address \"%V\"", &val);
+ /* fall through */
+
+ default:
+ return NULL;
+ }
+}
+
+
char *
ngx_http_upstream_param_set_slot(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf)
Modified: trunk/src/http/ngx_http_upstream.h
===================================================================
--- trunk/src/http/ngx_http_upstream.h 2013-01-10 13:17:29 UTC (rev 5008)
+++ trunk/src/http/ngx_http_upstream.h 2013-01-16 09:42:57 UTC (rev 5009)
@@ -121,6 +121,12 @@
typedef struct {
+ ngx_addr_t *addr;
+ ngx_http_complex_value_t *value;
+} ngx_http_upstream_local_t;
+
+
+typedef struct {
ngx_http_upstream_srv_conf_t *upstream;
ngx_msec_t connect_timeout;
@@ -158,7 +164,7 @@
ngx_array_t *hide_headers;
ngx_array_t *pass_headers;
- ngx_addr_t *local;
+ ngx_http_upstream_local_t *local;
#if (NGX_HTTP_CACHE)
ngx_shm_zone_t *cache;
More information about the nginx-devel
mailing list