Modified: xdebug/branches/xdebug_2_1/tests/bug00421.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/bug00421.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/bug00421.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -42,7 +42,7 @@
-> context_get -i 5 -c 0
-
+
-> detach -i 6
Modified: xdebug/branches/xdebug_2_1/tests/bug00475.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/bug00475.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/bug00475.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -37,7 +37,7 @@
-> property_get -i 4 -n a
-
+
-> detach -i 5
Added: xdebug/branches/xdebug_2_1/tests/bug00684.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/bug00684.phpt (rev 0)
+++ xdebug/branches/xdebug_2_1/tests/bug00684.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -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)
+
Modified: xdebug/branches/xdebug_2_1/tests/stacktrace_html_2.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/stacktrace_html_2.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/stacktrace_html_2.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_2.php:0 |
-| 2 | %f | %d | foo( array(5) ) | ../stacktrace_html_2.php:14 |
+| 2 | %f | %d | foo( array(5) ) | ../stacktrace_html_2.php:14 |
Modified: xdebug/branches/xdebug_2_1/tests/stacktrace_html_3.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/stacktrace_html_3.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/stacktrace_html_3.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_3.php:0 |
-| 2 | %f | %d | foo( 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 | %d | foo( 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 |
Modified: xdebug/branches/xdebug_2_1/tests/stacktrace_html_4.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/stacktrace_html_4.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/stacktrace_html_4.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_4.php:0 |
-| 2 | %f | %d | foo( $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 | %d | foo( $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 |
Modified: xdebug/branches/xdebug_2_1/tests/stacktrace_html_4_novar.phpt
===================================================================
--- xdebug/branches/xdebug_2_1/tests/stacktrace_html_4_novar.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/tests/stacktrace_html_4_novar.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_4_novar.php:0 |
-| 2 | %f | %d | foo( $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 | %d | foo( $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 |
Modified: xdebug/branches/xdebug_2_1/xdebug_var.c
===================================================================
--- xdebug/branches/xdebug_2_1/xdebug_var.c 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/branches/xdebug_2_1/xdebug_var.c 2011-05-02 17:49:32 UTC (rev 3439)
@@ -1065,7 +1065,7 @@
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);
Modified: xdebug/trunk/tests/bug00421.phpt
===================================================================
--- xdebug/trunk/tests/bug00421.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/bug00421.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -42,7 +42,7 @@
-> context_get -i 5 -c 0
-
+
-> detach -i 6
Modified: xdebug/trunk/tests/bug00475.phpt
===================================================================
--- xdebug/trunk/tests/bug00475.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/bug00475.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -37,7 +37,7 @@
-> property_get -i 4 -n a
-
+
-> detach -i 5
Added: xdebug/trunk/tests/bug00684.phpt
===================================================================
--- xdebug/trunk/tests/bug00684.phpt (rev 0)
+++ xdebug/trunk/tests/bug00684.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -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)
+
Modified: xdebug/trunk/tests/stacktrace_html_2.phpt
===================================================================
--- xdebug/trunk/tests/stacktrace_html_2.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/stacktrace_html_2.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_2.php:0 |
-| 2 | %f | %d | foo( array(5) ) | ../stacktrace_html_2.php:14 |
+| 2 | %f | %d | foo( array(5) ) | ../stacktrace_html_2.php:14 |
Modified: xdebug/trunk/tests/stacktrace_html_3.phpt
===================================================================
--- xdebug/trunk/tests/stacktrace_html_3.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/stacktrace_html_3.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_3.php:0 |
-| 2 | %f | %d | foo( 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 | %d | foo( 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 |
Modified: xdebug/trunk/tests/stacktrace_html_4.phpt
===================================================================
--- xdebug/trunk/tests/stacktrace_html_4.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/stacktrace_html_4.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_4.php:0 |
-| 2 | %f | %d | foo( $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 | %d | foo( $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 |
Modified: xdebug/trunk/tests/stacktrace_html_4_novar.phpt
===================================================================
--- xdebug/trunk/tests/stacktrace_html_4_novar.phpt 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/tests/stacktrace_html_4_novar.phpt 2011-05-02 17:49:32 UTC (rev 3439)
@@ -40,5 +40,5 @@
| Call Stack |
|---|
| # | Time | Memory | Function | Location |
|---|
| 1 | %f | %d | {main}( ) | ../stacktrace_html_4_novar.php:0 |
-| 2 | %f | %d | foo( $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 | %d | foo( $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 |
Modified: xdebug/trunk/xdebug_var.c
===================================================================
--- xdebug/trunk/xdebug_var.c 2011-04-11 10:16:37 UTC (rev 3438)
+++ xdebug/trunk/xdebug_var.c 2011-05-02 17:49:32 UTC (rev 3439)
@@ -1393,7 +1393,7 @@
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);