Skip to content

Commit f627b56

Browse files
authored
[fix]: fixed duplicated merge operations for HLS keys path.
1 parent 4e12f45 commit f627b56

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

hls/ngx_rtmp_hls_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2347,7 +2347,7 @@ ngx_rtmp_hls_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
23472347
ngx_conf_merge_str_value(conf->base_url, prev->base_url, "");
23482348
ngx_conf_merge_value(conf->granularity, prev->granularity, 0);
23492349
ngx_conf_merge_value(conf->keys, prev->keys, 0);
2350-
ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");
2350+
/*ngx_conf_merge_str_value(conf->key_path, prev->key_path, "");*/
23512351
ngx_conf_merge_str_value(conf->key_url, prev->key_url, "");
23522352
ngx_conf_merge_uint_value(conf->frags_per_key, prev->frags_per_key, 0);
23532353

0 commit comments

Comments
 (0)