|
17 | 17 | unsigned ngx_http_srcache_used = 0; |
18 | 18 |
|
19 | 19 | static void *ngx_http_srcache_create_loc_conf(ngx_conf_t *cf); |
20 | | -static char *ngx_http_srcache_merge_conf(ngx_conf_t *cf, void *parent, |
| 20 | +static char *ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, |
21 | 21 | void *child); |
22 | 22 | static ngx_int_t ngx_http_srcache_filter_init(ngx_conf_t *cf); |
23 | 23 | static char *ngx_http_srcache_conf_set_request(ngx_conf_t *cf, |
@@ -83,7 +83,7 @@ static ngx_http_module_t ngx_http_srcache_filter_module_ctx = { |
83 | 83 | NULL, /* merge server configuration */ |
84 | 84 |
|
85 | 85 | ngx_http_srcache_create_loc_conf, /* create location configuration */ |
86 | | - ngx_http_srcache_merge_conf /* merge location configuration */ |
| 86 | + ngx_http_srcache_merge_loc_conf /* merge location configuration */ |
87 | 87 | }; |
88 | 88 |
|
89 | 89 |
|
@@ -438,7 +438,7 @@ ngx_http_srcache_create_loc_conf(ngx_conf_t *cf) |
438 | 438 |
|
439 | 439 |
|
440 | 440 | static char * |
441 | | -ngx_http_srcache_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
| 441 | +ngx_http_srcache_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) |
442 | 442 | { |
443 | 443 | ngx_http_srcache_loc_conf_t *prev = parent; |
444 | 444 | ngx_http_srcache_loc_conf_t *conf = child; |
@@ -652,9 +652,9 @@ ngx_http_srcache_access_handler(ngx_http_request_t *r) |
652 | 652 |
|
653 | 653 | smcf = ngx_http_get_module_main_conf(r, ngx_http_srcache_filter_module); |
654 | 654 |
|
655 | | - if ( ! smcf->postponed_to_access_phase_end ) { |
| 655 | + if (! smcf->postponed_to_access_phase_end) { |
656 | 656 | ngx_http_core_main_conf_t *cmcf; |
657 | | - ngx_http_phase_handler_t tmp; |
| 657 | + ngx_http_phase_handler_t tmp; |
658 | 658 | ngx_http_phase_handler_t *ph; |
659 | 659 | ngx_http_phase_handler_t *cur_ph; |
660 | 660 | ngx_http_phase_handler_t *last_ph; |
|
0 commit comments