Author: julianfoad
Date: Wed Dec 23 11:39:34 2009
New Revision: 893478
URL: http://svn.apache.org/viewvc?rev=893478&view=rev
Log:
In mod_dav_svn, make error output from the post-commit hook XML-safe, to fix
the error that occurred if a post-commit error message contained "&" or "<"
characters. See issue #3553.
* subversion/mod_dav_svn/merge.c
(dav_svn__merge_response): XML-quote the error string.
Modified:
subversion/trunk/subversion/mod_dav_svn/merge.c
Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=893478&r1=893477&r2=893478&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Wed Dec 23 11:39:34 2009
@@ -252,7 +252,9 @@
post_commit_err_elem = apr_psprintf(pool,
"<S:post-commit-err>%s"
"</S:post-commit-err>",
- post_commit_err);
+ apr_xml_quote_string(pool,
+ post_commit_err,
+ 0));
}
else
{
