@@ -254,8 +254,8 @@ static http_parser_settings settings = {
254
254
.on_message_complete = 0
255
255
};
256
256
257
- ngx_atomic_t upsync_shared_created0 ;
258
- ngx_atomic_t * upsync_shared_created = & upsync_shared_created0 ;
257
+ ngx_atomic_t stream_upsync_shared_created0 ;
258
+ ngx_atomic_t * stream_upsync_shared_created = & stream_upsync_shared_created0 ;
259
259
260
260
static http_parser * parser = NULL ;
261
261
static ngx_stream_http_state state ;
@@ -1913,10 +1913,10 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
1913
1913
1914
1914
upsync_server = upsync_ctx -> upsync_server ;
1915
1915
1916
- if (* upsync_shared_created ) {
1917
- shm .size = 128 * (* upsync_shared_created );
1916
+ if (* stream_upsync_shared_created ) {
1917
+ shm .size = 128 * (* stream_upsync_shared_created );
1918
1918
shm .log = cycle -> log ;
1919
- shm .addr = (u_char * )(upsync_shared_created );
1919
+ shm .addr = (u_char * )(stream_upsync_shared_created );
1920
1920
shm .name .len = sizeof ("ngx_upsync_shared_zone" );
1921
1921
shm .name .data = (u_char * )"ngx_upsync_shared_zone" ;
1922
1922
@@ -1942,7 +1942,7 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
1942
1942
}
1943
1943
shared = shm .addr ;
1944
1944
1945
- upsync_shared_created = (ngx_atomic_t * )shared ;
1945
+ stream_upsync_shared_created = (ngx_atomic_t * )shared ;
1946
1946
1947
1947
for (i = 0 ; i < upsync_ctx -> upstream_num ; i ++ ) {
1948
1948
@@ -1970,7 +1970,7 @@ ngx_stream_upsync_init_shm_mutex(ngx_cycle_t *cycle)
1970
1970
}
1971
1971
}
1972
1972
1973
- ngx_atomic_cmp_set (upsync_shared_created , * upsync_shared_created ,
1973
+ ngx_atomic_cmp_set (stream_upsync_shared_created , * stream_upsync_shared_created ,
1974
1974
upsync_ctx -> upstream_num );
1975
1975
1976
1976
return NGX_OK ;
0 commit comments