Author: svn-role Date: Wed Jan 3 04:00:06 2018 New Revision: 1819922 URL: http://svn.apache.org/viewvc?rev=1819922&view=rev Log: Merge r1819603 from trunk:
* r1819603 Fix a bug in the config parser that caused it to strip leading characters from value continuation lines. Justification: Existing config files should keep working. Votes: +1: brane, danielsh, jamessan Modified: subversion/branches/1.10.x/ (props changed) subversion/branches/1.10.x/STATUS subversion/branches/1.10.x/subversion/libsvn_subr/config_file.c subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.c subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.cfg Propchange: subversion/branches/1.10.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 3 04:00:06 2018 @@ -99,4 +99,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162 +/subversion/trunk:1817837,1817856,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819093,1819162,1819603 Modified: subversion/branches/1.10.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1819922&r1=1819921&r2=1819922&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Wed Jan 3 04:00:06 2018 @@ -83,12 +83,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1819603 - Fix a bug in the config parser that caused it to strip leading characters - from value continuation lines. - Justification: - Existing config files should keep working. - Votes: - +1: brane, danielsh, jamessan - Modified: subversion/branches/1.10.x/subversion/libsvn_subr/config_file.c URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_subr/config_file.c?rev=1819922&r1=1819921&r2=1819922&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/libsvn_subr/config_file.c (original) +++ subversion/branches/1.10.x/subversion/libsvn_subr/config_file.c Wed Jan 3 04:00:06 2018 @@ -466,6 +466,7 @@ parse_value_continuation_lines(int *pch, else { /* This is a continuation line. Read it. */ + SVN_ERR(parser_ungetc(ctx, ch)); SVN_ERR(parser_get_line(ctx, ctx->line_read, &ch)); /* Trailing whitespace is ignored. */ Modified: subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.c URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.c?rev=1819922&r1=1819921&r2=1819922&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.c (original) +++ subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.c Wed Jan 3 04:00:06 2018 @@ -70,12 +70,12 @@ get_config_file_path(const char **cfg_fi } static const char *config_keys[] = { "foo", "a", "b", "c", "d", "e", "f", "g", - "h", "i", NULL }; + "h", "i", "m", NULL }; static const char *config_values[] = { "bar", "Aa", "100", "bar", "a %(bogus)s oyster bar", "%(bogus)s shmoo %(", "%Aa", "lyrical bard", "%(unterminated", - "Aa 100", NULL }; + "Aa 100", "foo bar baz", NULL }; static svn_error_t * test_text_retrieval(const svn_test_opts_t *opts, Modified: subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.cfg URL: http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.cfg?rev=1819922&r1=1819921&r2=1819922&view=diff ============================================================================== --- subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.cfg (original) +++ subversion/branches/1.10.x/subversion/tests/libsvn_subr/config-test.cfg Wed Jan 3 04:00:06 2018 @@ -45,6 +45,10 @@ j=some %(k)scle k=c%(j)sy # Depends on a cyclic definition l=depends on a %(j)scycle! +# line continuation +m = foo + bar + baz [UpperCaseSection] a=Aa