Upstream: reset local address in case of error.

arut · arut · commit 364a94ecec13 · 2025-10-24T17:49:04.000+04:00
After f10bc5a the address was set to NULL only when local address was not specified at all. In case complex value evaluated to an empty or invalid string, local address remained unchanged. Currenrly this is not a problem since the value is only set once. This change is a preparation for being able to change the local address after initial setting.
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
@@ -6898,6 +6898,7 @@ ngx_http_upstream_set_local(ngx_http_request_t *r, ngx_http_upstream_t *u,
     }
 
     if (val.len == 0) {
+        u->peer.local = NULL;
         return NGX_OK;
     }
 
@@ -6914,6 +6915,7 @@ ngx_http_upstream_set_local(ngx_http_request_t *r, ngx_http_upstream_t *u,
     if (rc != NGX_OK) {
         ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
                       "invalid local address \"%V\"", &val);
+        u->peer.local = NULL;
         return NGX_OK;
     }
 
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
@@ -680,6 +680,7 @@ ngx_stream_proxy_set_local(ngx_stream_session_t *s, ngx_stream_upstream_t *u,
     }
 
     if (val.len == 0) {
+        u->peer.local = NULL;
         return NGX_OK;
     }
 
@@ -696,6 +697,7 @@ ngx_stream_proxy_set_local(ngx_stream_session_t *s, ngx_stream_upstream_t *u,
     if (rc != NGX_OK) {
         ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
                       "invalid local address \"%V\"", &val);
+        u->peer.local = NULL;
         return NGX_OK;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -6898,6 +6898,7 @@ ngx_http_upstream_set_local(ngx_http_request_t r, ngx_http_upstream_t u,`
`6898`	`6898`	`}`
`6899`	`6899`
`6900`	`6900`	`if (val.len == 0) {`
	`6901`	`+ u->peer.local = NULL;`
`6901`	`6902`	`return NGX_OK;`
`6902`	`6903`	`}`
`6903`	`6904`
`@@ -6914,6 +6915,7 @@ ngx_http_upstream_set_local(ngx_http_request_t r, ngx_http_upstream_t u,`
`6914`	`6915`	`if (rc != NGX_OK) {`
`6915`	`6916`	`ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,`
`6916`	`6917`	`"invalid local address \"%V\"", &val);`
	`6918`	`+ u->peer.local = NULL;`
`6917`	`6919`	`return NGX_OK;`
`6918`	`6920`	`}`
`6919`	`6921`
Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,7 @@ ngx_stream_proxy_set_local(ngx_stream_session_t s, ngx_stream_upstream_t u,`
`680`	`680`	`}`
`681`	`681`
`682`	`682`	`if (val.len == 0) {`
	`683`	`+ u->peer.local = NULL;`
`683`	`684`	`return NGX_OK;`
`684`	`685`	`}`
`685`	`686`
`@@ -696,6 +697,7 @@ ngx_stream_proxy_set_local(ngx_stream_session_t s, ngx_stream_upstream_t u,`
`696`	`697`	`if (rc != NGX_OK) {`
`697`	`698`	`ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,`
`698`	`699`	`"invalid local address \"%V\"", &val);`
	`700`	`+ u->peer.local = NULL;`
`699`	`701`	`return NGX_OK;`
`700`	`702`	`}`
`701`	`703`