Merge branch 'PHP-5.6'

* PHP-5.6:
  Escape non-printable characters in the junit XML output

1 files changed, 3 insertions, 0 deletions

diff --git a/run-tests.php b/run-tests.php
index cd57747b2f..1b5bcec253 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2708,6 +2708,9 @@ function junit_mark_test_as($type, $file_name, $test_name, $time = null, $messag
 	junit_suite_record($suite, 'execution_time', $time);
 
 	$escaped_details = htmlspecialchars($details, ENT_QUOTES, 'UTF-8');
+	$escaped_details = preg_replace_callback('/[\0-\x08\x0B\x0C\x0E-\x1F]/', function ($c) {
+		return sprintf('[[0x%02x]]', ord($c[0]));
+	}, $escaped_details);
 	$escaped_message = htmlspecialchars($message, ENT_QUOTES, 'UTF-8');
 
     $escaped_test_name = basename($file_name) . ' - ' . htmlspecialchars($test_name, ENT_QUOTES);