From 622c5ffa4643e54f6d24fbc47681be87648a7601 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Mon, 2 May 2011 17:49:32 +0000 Subject: [PATCH] - Fixed bug #684: xdebug_var_dump - IE does not support &. SVN Rev: 3439 --- tests/bug00421.phpt | 2 +- tests/bug00475.phpt | 2 +- tests/bug00684.phpt | 11 +++++++++++ tests/stacktrace_html_2.phpt | 2 +- tests/stacktrace_html_3.phpt | 2 +- tests/stacktrace_html_4.phpt | 2 +- tests/stacktrace_html_4_novar.phpt | 2 +- xdebug_var.c | 2 +- 8 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 tests/bug00684.phpt diff --git a/tests/bug00421.phpt b/tests/bug00421.phpt index 107c03bec..cdffbcff7 100644 --- a/tests/bug00421.phpt +++ b/tests/bug00421.phpt @@ -42,7 +42,7 @@ dbgpRun( str_replace( 'FILE', "\"$file\"", $data ), $commands ); -> context_get -i 5 -c 0 - + -> detach -i 6 diff --git a/tests/bug00475.phpt b/tests/bug00475.phpt index 0ccd38ffb..aa933ce0a 100644 --- a/tests/bug00475.phpt +++ b/tests/bug00475.phpt @@ -37,7 +37,7 @@ dbgpRun( $data, $commands ); -> property_get -i 4 -n a - + -> detach -i 5 diff --git a/tests/bug00684.phpt b/tests/bug00684.phpt new file mode 100644 index 000000000..904c84808 --- /dev/null +++ b/tests/bug00684.phpt @@ -0,0 +1,11 @@ +--TEST-- +Test for bug #684: xdebug_var_dump - IE does not support & +--INI-- +html_errors=1 +--FILE-- + +--EXPECT-- +
string 'Testing isn't fun' (length=17)
+
diff --git a/tests/stacktrace_html_2.phpt b/tests/stacktrace_html_2.phpt index 9df4d23ab..24238a182 100644 --- a/tests/stacktrace_html_2.phpt +++ b/tests/stacktrace_html_2.phpt @@ -40,5 +40,5 @@ foo( $a ); Call Stack #TimeMemoryFunctionLocation 1%f%d{main}( )../stacktrace_html_2.php:0 -2%f%dfoo( array(5) )../stacktrace_html_2.php:14 +2%f%dfoo( array(5) )../stacktrace_html_2.php:14 diff --git a/tests/stacktrace_html_3.phpt b/tests/stacktrace_html_3.phpt index 8f742beec..0285e064d 100644 --- a/tests/stacktrace_html_3.phpt +++ b/tests/stacktrace_html_3.phpt @@ -40,5 +40,5 @@ foo( $a ); Call Stack #TimeMemoryFunctionLocation 1%f%d{main}( )../stacktrace_html_3.php:0 -2%f%dfoo( array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_3.php:14 +2%f%dfoo( array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_3.php:14 diff --git a/tests/stacktrace_html_4.phpt b/tests/stacktrace_html_4.phpt index fbac37d48..6d5022c57 100644 --- a/tests/stacktrace_html_4.phpt +++ b/tests/stacktrace_html_4.phpt @@ -40,5 +40,5 @@ foo( $a ); Call Stack #TimeMemoryFunctionLocation 1%f%d{main}( )../stacktrace_html_4.php:0 -2%f%dfoo( $a = array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_4.php:14 +2%f%dfoo( $a = array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_4.php:14 diff --git a/tests/stacktrace_html_4_novar.phpt b/tests/stacktrace_html_4_novar.phpt index 537af9ba5..fb874be47 100644 --- a/tests/stacktrace_html_4_novar.phpt +++ b/tests/stacktrace_html_4_novar.phpt @@ -40,5 +40,5 @@ foo( $a ); Call Stack #TimeMemoryFunctionLocation 1%f%d{main}( )../stacktrace_html_4_novar.php:0 -2%f%dfoo( $a = array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_4_novar.php:14 +2%f%dfoo( $a = array (42 => FALSE, 'foo' => 912124, 43 => class stdClass { public $bar = 100 }, 44 => class stdClass { }, 45 => resource(5) of type (stream)) )../stacktrace_html_4_novar.php:14 diff --git a/xdebug_var.c b/xdebug_var.c index 31ae8de6a..07ba97258 100644 --- a/xdebug_var.c +++ b/xdebug_var.c @@ -1065,7 +1065,7 @@ char* xdebug_xmlize(char *string, int len, int *newlen) tmp2 = php_str_to_str(tmp, len, "\"", 1, """, 6, &len); efree(tmp); - tmp = php_str_to_str(tmp2, len, "'", 1, "'", 6, &len); + tmp = php_str_to_str(tmp2, len, "'", 1, "'", 5, &len); efree(tmp2); tmp2 = php_str_to_str(tmp, len, "\n", 1, " ", 5, &len);