Skip to content

Commit 7c69ccd

Browse files
committed
renamed macro HAVE_UPSTREAM_TIMEOUT_FIELDS to HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS.
1 parent e90e0c1 commit 7c69ccd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/ngx_http_lua_balancer.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ struct ngx_http_lua_balancer_peer_data_s {
3434

3535
int last_peer_state;
3636

37-
#if !(HAVE_UPSTREAM_TIMEOUT_FIELDS)
37+
#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
3838
unsigned cloned_upstream_conf; /* :1 */
3939
#endif
4040
};
@@ -548,7 +548,7 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
548548
ngx_http_lua_ctx_t *ctx;
549549
ngx_http_upstream_t *u;
550550

551-
#if !(HAVE_UPSTREAM_TIMEOUT_FIELDS)
551+
#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
552552
ngx_http_upstream_conf_t *ucf;
553553
#endif
554554
ngx_http_lua_main_conf_t *lmcf;
@@ -585,7 +585,7 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
585585
return NGX_ERROR;
586586
}
587587

588-
#if !(HAVE_UPSTREAM_TIMEOUT_FIELDS)
588+
#if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
589589
if (!bp->cloned_upstream_conf) {
590590
/* we clone the upstream conf for the current request so that
591591
* we do not affect other requests at all. */
@@ -608,23 +608,23 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
608608
#endif
609609

610610
if (connect_timeout > 0) {
611-
#if (HAVE_UPSTREAM_TIMEOUT_FIELDS)
611+
#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
612612
u->connect_timeout = (ngx_msec_t) connect_timeout;
613613
#else
614614
ucf->connect_timeout = (ngx_msec_t) connect_timeout;
615615
#endif
616616
}
617617

618618
if (send_timeout > 0) {
619-
#if (HAVE_UPSTREAM_TIMEOUT_FIELDS)
619+
#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
620620
u->send_timeout = (ngx_msec_t) send_timeout;
621621
#else
622622
ucf->send_timeout = (ngx_msec_t) send_timeout;
623623
#endif
624624
}
625625

626626
if (read_timeout > 0) {
627-
#if (HAVE_UPSTREAM_TIMEOUT_FIELDS)
627+
#if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS)
628628
u->read_timeout = (ngx_msec_t) read_timeout;
629629
#else
630630
ucf->read_timeout = (ngx_msec_t) read_timeout;

0 commit comments

Comments
 (0)