Skip to content

Commit 5c172b3

Browse files
authored
PATCH: config.c: problems with #tryinclude statements, whitespace (#48)
Pull in Asterisk pull requests for the following issues : 1. asterisk/asterisk#920 asterisk/asterisk#918 Correct an issue in ast_config_text_file_save2() when updating configuration files with "#tryinclude" statements. The API currently replaces "#tryinclude" with "#include". The API also creates empty template files if the referenced files do not exist. This patch resolves these problems. 2. asterisk/asterisk#970 asterisk/asterisk#971 Configurations loaded with the ast_config_load2() API and later written out with ast_config_text_file_save2() will have any leading whitespace stripped away. The APIs should make reasonable efforts to maintain the content and formatting of the configuration files.
1 parent f67a2d8 commit 5c172b3

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

phreaknet.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,6 +2207,8 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR
22072207
asterisk_pr_unconditional 917 # FreeBSD compilation fixes
22082208
git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides
22092209
git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides
2210+
asterisk_pr_unconditional 918 # config.c #tryinclude fixes
2211+
asterisk_pr_unconditional 971 # config.c fix issues w/ whitespace in comments
22102212

22112213
if [ $AST_MAJOR_VER -lt 21 ]; then
22122214
if [ "$EXTERNAL_CODECS" = "1" ]; then

0 commit comments

Comments
 (0)