@@ -34,7 +34,7 @@ struct ngx_http_lua_balancer_peer_data_s {
34
34
35
35
int last_peer_state ;
36
36
37
- #if !(HAVE_UPSTREAM_TIMEOUT_FIELDS )
37
+ #if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
38
38
unsigned cloned_upstream_conf ; /* :1 */
39
39
#endif
40
40
};
@@ -548,7 +548,7 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
548
548
ngx_http_lua_ctx_t * ctx ;
549
549
ngx_http_upstream_t * u ;
550
550
551
- #if !(HAVE_UPSTREAM_TIMEOUT_FIELDS )
551
+ #if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
552
552
ngx_http_upstream_conf_t * ucf ;
553
553
#endif
554
554
ngx_http_lua_main_conf_t * lmcf ;
@@ -585,7 +585,7 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
585
585
return NGX_ERROR ;
586
586
}
587
587
588
- #if !(HAVE_UPSTREAM_TIMEOUT_FIELDS )
588
+ #if !(HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
589
589
if (!bp -> cloned_upstream_conf ) {
590
590
/* we clone the upstream conf for the current request so that
591
591
* we do not affect other requests at all. */
@@ -608,23 +608,23 @@ ngx_http_lua_ffi_balancer_set_timeouts(ngx_http_request_t *r,
608
608
#endif
609
609
610
610
if (connect_timeout > 0 ) {
611
- #if (HAVE_UPSTREAM_TIMEOUT_FIELDS )
611
+ #if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
612
612
u -> connect_timeout = (ngx_msec_t ) connect_timeout ;
613
613
#else
614
614
ucf -> connect_timeout = (ngx_msec_t ) connect_timeout ;
615
615
#endif
616
616
}
617
617
618
618
if (send_timeout > 0 ) {
619
- #if (HAVE_UPSTREAM_TIMEOUT_FIELDS )
619
+ #if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
620
620
u -> send_timeout = (ngx_msec_t ) send_timeout ;
621
621
#else
622
622
ucf -> send_timeout = (ngx_msec_t ) send_timeout ;
623
623
#endif
624
624
}
625
625
626
626
if (read_timeout > 0 ) {
627
- #if (HAVE_UPSTREAM_TIMEOUT_FIELDS )
627
+ #if (HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS )
628
628
u -> read_timeout = (ngx_msec_t ) read_timeout ;
629
629
#else
630
630
ucf -> read_timeout = (ngx_msec_t ) read_timeout ;
0 commit comments