date:20111201

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_hash.c trunk/Zend/zend_hash.c

2011-12-01 Thread Dmitry Stogov

dmitry   Thu, 01 Dec 2011 13:58:29 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320245

Log:
Fixed icorrect key length after updating constant index

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/zend_hash.c
U   php/php-src/trunk/Zend/zend_hash.c

Modified: php/php-src/branches/PHP_5_4/Zend/zend_hash.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-12-01 13:30:19 UTC 
(rev 320244)
+++ php/php-src/branches/PHP_5_4/Zend/zend_hash.c   2011-12-01 13:58:29 UTC 
(rev 320245)
@@ -1399,6 +1399,7 @@
p-h = num_index;
} else {
p-h = h;
+   p-nKeyLength = str_length;
if (IS_INTERNED(str_index)) {
p-arKey = str_index;
} else {

Modified: php/php-src/trunk/Zend/zend_hash.c
===
--- php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:30:19 UTC (rev 320244)
+++ php/php-src/trunk/Zend/zend_hash.c  2011-12-01 13:58:29 UTC (rev 320245)
@@ -1399,6 +1399,7 @@
p-h = num_index;
} else {
p-h = h;
+   p-nKeyLength = str_length;
if (IS_INTERNED(str_index)) {
p-arKey = str_index;
} else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/array/ array_change_key_case_variation8.phpt arsort_variation5.phpt asort_variation5.phpt krsort_variation5.phpt ksort_variation5.phpt natcasesort_

2011-12-01 Thread Felipe Pena

felipe   Thu, 01 Dec 2011 14:14:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320246

Log:
- Fixed tests

Changed paths:
U   
php/php-src/trunk/ext/standard/tests/array/array_change_key_case_variation8.phpt
U   php/php-src/trunk/ext/standard/tests/array/arsort_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/array/asort_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/array/krsort_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/array/ksort_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/array/natcasesort_variation4.phpt
U   php/php-src/trunk/ext/standard/tests/array/rsort_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/array/sort_variation5.phpt

Modified: 
php/php-src/trunk/ext/standard/tests/array/array_change_key_case_variation8.phpt
===
--- 
php/php-src/trunk/ext/standard/tests/array/array_change_key_case_variation8.phpt
2011-12-01 13:58:29 UTC (rev 320245)
+++ 
php/php-src/trunk/ext/standard/tests/array/array_change_key_case_variation8.phpt
2011-12-01 14:14:30 UTC (rev 320246)
@@ -42,7 +42,7 @@
   int(3)
   [\cx]=
   int(4)
-  [\e]=
+  []=
   int(5)
   []=
   int(6)
@@ -66,7 +66,7 @@
   int(3)
   [\CX]=
   int(4)
-  [\E]=
+  []=
   int(5)
   []=
   int(6)
@@ -125,4 +125,4 @@
   [X]=
   int(10)
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/array/arsort_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/array/arsort_variation5.phpt   
2011-12-01 13:58:29 UTC (rev 320245)
+++ php/php-src/trunk/ext/standard/tests/array/arsort_variation5.phpt   
2011-12-01 14:14:30 UTC (rev 320246)
@@ -68,14 +68,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -100,14 +100,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -132,14 +132,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -245,4 +245,4 @@
   [B]=
   string(6) BANANA
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/array/asort_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/array/asort_variation5.phpt
2011-12-01 13:58:29 UTC (rev 320245)
+++ php/php-src/trunk/ext/standard/tests/array/asort_variation5.phpt
2011-12-01 14:14:30 UTC (rev 320246)
@@ -84,14 +84,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }
@@ -116,14 +116,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }
@@ -148,14 +148,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }

Modified: php/php-src/trunk/ext/standard/tests/array/krsort_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/array/krsort_variation5.phpt   
2011-12-01 13:58:29 UTC (rev 320245)
+++ php/php-src/trunk/ext/standard/tests/array/krsort_variation5.phpt   
2011-12-01 14:14:30 UTC (rev 320246)
@@ -68,14 +68,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -98,14 +98,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -128,14 +128,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
Modified: php/php-src/trunk/ext/standard/tests/array/ksort_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/array/ksort_variation5.phpt
2011-12-01 13:58:29 UTC (rev 320245)
+++ php/php-src/trunk/ext/standard/tests/array/ksort_variation5.phpt
2011-12-01 14:14:30 UTC (rev 320246)
@@ -82,14 +82,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/tests/array/ array_change_key_case_variation8.phpt arsort_variation5.phpt asort_variation5.phpt krsort_variation5.phpt ksort_variation5.phpt n

2011-12-01 Thread Felipe Pena

felipe   Thu, 01 Dec 2011 14:15:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320247

Log:
- Fixed tests

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/array_change_key_case_variation8.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/arsort_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/krsort_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/ksort_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/natcasesort_variation4.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/rsort_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/array/sort_variation5.phpt

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/array/array_change_key_case_variation8.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/array/array_change_key_case_variation8.phpt	2011-12-01 14:14:30 UTC (rev 320246)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/array/array_change_key_case_variation8.phpt	2011-12-01 14:15:22 UTC (rev 320247)
@@ -42,7 +42,7 @@
   int(3)
   [\cx]=
   int(4)
-  [\e]=
+  []=
   int(5)
   []=
   int(6)
@@ -66,7 +66,7 @@
   int(3)
   [\CX]=
   int(4)
-  [\E]=
+  []=
   int(5)
   []=
   int(6)
@@ -125,4 +125,4 @@
   [X]=
   int(10)
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/array/arsort_variation5.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/array/arsort_variation5.phpt	2011-12-01 14:14:30 UTC (rev 320246)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/array/arsort_variation5.phpt	2011-12-01 14:15:22 UTC (rev 320247)
@@ -68,14 +68,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -100,14 +100,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -132,14 +132,14 @@
 array(12) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -245,4 +245,4 @@
   [B]=
   string(6) BANANA
 }
-Done
\ No newline at end of file
+Done

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt	2011-12-01 14:14:30 UTC (rev 320246)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/array/asort_variation5.phpt	2011-12-01 14:15:22 UTC (rev 320247)
@@ -84,14 +84,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }
@@ -116,14 +116,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }
@@ -148,14 +148,14 @@
 ]=
   string(1) 
 
+  []=
+  string(1) 
   [\a]=
   string(2) \a
   [\cx]=
   string(3) \cx
   [\ddd]=
   string(4) \ddd
-  [\e]=
-  string(2) \e
   [\xhh]=
   string(4) \xhh
 }

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/array/krsort_variation5.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/array/krsort_variation5.phpt	2011-12-01 14:14:30 UTC (rev 320246)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/array/krsort_variation5.phpt	2011-12-01 14:15:22 UTC (rev 320247)
@@ -68,14 +68,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -98,14 +98,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
@@ -128,14 +128,14 @@
 array(11) {
   [\xhh]=
   string(4) \xhh
-  [\e]=
-  string(2) \e
   [\ddd]=
   string(4) \ddd
   [\cx]=
   string(3) \cx
   [\a]=
   string(2) \a
+  []=
+  string(1) 
   [
 ]=
   string(1) 
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/array/ksort_variation5.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/array/ksort_variation5.phpt	2011-12-01 14:14:30

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt branches/PHP_5_4/ext/standard/tests/

2011-12-01 Thread Felipe Pena

felipe   Thu, 01 Dec 2011 15:38:17 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320251

Log:
- Fixed tests

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtok_variation6.phpt
U   php/php-src/trunk/ext/standard/tests/strings/strrchr_variation5.phpt
U   php/php-src/trunk/ext/standard/tests/strings/strspn_variation6.phpt
U   php/php-src/trunk/ext/standard/tests/strings/strtok_variation6.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt 
2011-12-01 15:09:41 UTC (rev 320250)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt 
2011-12-01 15:38:17 UTC (rev 320251)
@@ -34,24 +34,24 @@
 ?
 --EXPECTF--
 *** Testing strrchr() function: with heredoc strings ***
-string(33) st
+string(32) st
 
 ch
  using
-\escape \seque
+scape \seque
 ce
 string(9) \seque
 ce
-string(25) 
+string(24) 
  using
-\escape \seque
+scape \seque
 ce
 string(9) \seque
 ce
-string(33) st
+string(32) st
 
 ch
  using
-\escape \seque
+scape \seque
 ce
 *** Done ***

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt  
2011-12-01 15:09:41 UTC (rev 320250)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt  
2011-12-01 15:38:17 UTC (rev 320251)
@@ -137,7 +137,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -149,7 +149,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -161,7 +161,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -173,7 +173,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)
-Done
\ No newline at end of file
+Done

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtok_variation6.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtok_variation6.phpt  
2011-12-01 15:09:41 UTC (rev 320250)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtok_variation6.phpt  
2011-12-01 15:38:17 UTC (rev 320251)
@@ -25,7 +25,7 @@
   / ,
   /k,
   \k,
-  \\\k\h\e\l\o\w\r\l\d
+  \\\k\h\\e\l\o\w\r\l\d
);

 // loop through each element of the array and check the working of strtok()

Modified: php/php-src/trunk/ext/standard/tests/strings/strrchr_variation5.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/strrchr_variation5.phpt
2011-12-01 15:09:41 UTC (rev 320250)
+++ php/php-src/trunk/ext/standard/tests/strings/strrchr_variation5.phpt
2011-12-01 15:38:17 UTC (rev 320251)
@@ -34,24 +34,24 @@
 ?
 --EXPECTF--
 *** Testing strrchr() function: with heredoc strings ***
-string(33) st
+string(32) st
 
 ch
  using
-\escape \seque
+scape \seque
 ce
 string(9) \seque
 ce
-string(25) 
+string(24) 
  using
-\escape \seque
+scape \seque
 ce
 string(9) \seque
 ce
-string(33) st
+string(32) st
 
 ch
  using
-\escape \seque
+scape \seque
 ce
 *** Done ***

Modified: php/php-src/trunk/ext/standard/tests/strings/strspn_variation6.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/strspn_variation6.phpt 
2011-12-01 15:09:41 UTC (rev 320250)
+++ php/php-src/trunk/ext/standard/tests/strings/strspn_variation6.phpt 
2011-12-01 15:38:17 UTC (rev 320251)
@@ -137,7 +137,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -149,7 +149,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -161,7 +161,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)

@@ -173,7 +173,7 @@
 int(0)
 int(0)
 int(0)
-int(4)
+int(1)
 int(0)
 int(4)
-Done
\ No newline at end of file
+Done

Modified: php/php-src/trunk/ext/standard/tests/strings/strtok_variation6.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/strtok_variation6.phpt 
2011-12-01 15:09:41 UTC (rev 320250)
+++ php/php-src/trunk/ext/standard/tests/strings/strtok_variation6.phpt 
2011-12-01 15:38:17 UTC (rev 320251)
@@ -25,7 +25,7 @@
   / ,
   /k,
   \k,
-  \\\k\h\e\l\o\w\r\l\d
+

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

2011-12-01 Thread Felipe Pena

felipe   Thu, 01 Dec 2011 15:47:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320252

Log:
- Replace possible esc char to esc in the XML output

Changed paths:
U   php/php-src/branches/PHP_5_3/run-tests.php
U   php/php-src/branches/PHP_5_4/run-tests.php
U   php/php-src/trunk/run-tests.php

Modified: php/php-src/branches/PHP_5_3/run-tests.php
===
--- php/php-src/branches/PHP_5_3/run-tests.php  2011-12-01 15:38:17 UTC (rev 
320251)
+++ php/php-src/branches/PHP_5_3/run-tests.php  2011-12-01 15:47:58 UTC (rev 
320252)
@@ -2100,11 +2100,11 @@
}
elseif (in_array('FAIL', $restype)) {
$JUNIT['test_fail']++;
-   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/failure'.\n;
+   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/failure'.\n;
}
else{
$JUNIT['test_error']++;
-   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/error'.\n;
+   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/error'.\n;
}
$JUNIT['result_xml'] .= '/testcase'.\n;
}

Modified: php/php-src/branches/PHP_5_4/run-tests.php
===
--- php/php-src/branches/PHP_5_4/run-tests.php  2011-12-01 15:38:17 UTC (rev 
320251)
+++ php/php-src/branches/PHP_5_4/run-tests.php  2011-12-01 15:47:58 UTC (rev 
320252)
@@ -2100,11 +2100,11 @@
}
elseif (in_array('FAIL', $restype)) {
$JUNIT['test_fail']++;
-   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/failure'.\n;
+   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/failure'.\n;
}
else{
$JUNIT['test_error']++;
-   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/error'.\n;
+   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/error'.\n;
}
$JUNIT['result_xml'] .= '/testcase'.\n;
}

Modified: php/php-src/trunk/run-tests.php
===
--- php/php-src/trunk/run-tests.php 2011-12-01 15:38:17 UTC (rev 320251)
+++ php/php-src/trunk/run-tests.php 2011-12-01 15:47:58 UTC (rev 320252)
@@ -2100,11 +2100,11 @@
}
elseif (in_array('FAIL', $restype)) {
$JUNIT['test_fail']++;
-   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/failure'.\n;
+   $JUNIT['result_xml'] .= 'failure 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/failure'.\n;
}
else{
$JUNIT['test_error']++;
-   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.$diff.\n.']]/error'.\n;
+   $JUNIT['result_xml'] .= 'error 
type='.$restype[0].'ED 
message='.$info.'![CDATA['.\n.preg_replace('/\e/', 'esc', 
$diff).\n.']]/error'.\n;
}
$JUNIT['result_xml'] .= '/testcase'.\n;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/configure.in trunk/configure.in

2011-12-01 Thread Felipe Pena

felipe   Thu, 01 Dec 2011 16:40:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320254

Log:
- Escape [ ] chars in the configure message
  Patch by: Daniel Convissor

Changed paths:
U   php/php-src/branches/PHP_5_4/configure.in
U   php/php-src/trunk/configure.in

Modified: php/php-src/branches/PHP_5_4/configure.in
===
--- php/php-src/branches/PHP_5_4/configure.in   2011-12-01 16:34:50 UTC (rev 
320253)
+++ php/php-src/branches/PHP_5_4/configure.in   2011-12-01 16:40:07 UTC (rev 
320254)
@@ -863,7 +863,7 @@

 PHP_ARG_WITH(layout, layout of installed files,
 [  --with-layout=TYPE  Set how installed files will be laid out.  Type can
-  be either PHP or GNU [PHP]], PHP, no)
+  be either PHP or GNU @:@PHP@:@], PHP, no)

 case $PHP_LAYOUT in
   GNU)
@@ -876,7 +876,7 @@

 PHP_ARG_WITH(config-file-path, path to configuration file,
 [  --with-config-file-path=PATH
-  Set the path in which to look for php.ini 
[PREFIX/lib]], DEFAULT, no)
+  Set the path in which to look for php.ini 
@:@PREFIX/lib@:@], DEFAULT, no)

 if test $PHP_CONFIG_FILE_PATH = DEFAULT; then
   case $PHP_LAYOUT in
@@ -1068,7 +1068,7 @@
 fi

 PHP_ARG_WITH(pear, [whether to install PEAR],
-[  --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php]
+[  --with-pear=DIR Install PEAR in DIR @:@PREFIX/lib/php@:@
   --without-pear  Do not install PEAR], DEFAULT, yes)

 if test $PHP_PEAR != no; then

Modified: php/php-src/trunk/configure.in
===
--- php/php-src/trunk/configure.in  2011-12-01 16:34:50 UTC (rev 320253)
+++ php/php-src/trunk/configure.in  2011-12-01 16:40:07 UTC (rev 320254)
@@ -863,7 +863,7 @@

 PHP_ARG_WITH(layout, layout of installed files,
 [  --with-layout=TYPE  Set how installed files will be laid out.  Type can
-  be either PHP or GNU [PHP]], PHP, no)
+  be either PHP or GNU @:@PHP@:@], PHP, no)

 case $PHP_LAYOUT in
   GNU)
@@ -876,7 +876,7 @@

 PHP_ARG_WITH(config-file-path, path to configuration file,
 [  --with-config-file-path=PATH
-  Set the path in which to look for php.ini 
[PREFIX/lib]], DEFAULT, no)
+  Set the path in which to look for php.ini 
@:@PREFIX/lib@:@], DEFAULT, no)

 if test $PHP_CONFIG_FILE_PATH = DEFAULT; then
   case $PHP_LAYOUT in
@@ -1068,7 +1068,7 @@
 fi

 PHP_ARG_WITH(pear, [whether to install PEAR],
-[  --with-pear=DIR Install PEAR in DIR [PREFIX/lib/php]
+[  --with-pear=DIR Install PEAR in DIR @:@PREFIX/lib/php@:@
   --without-pear  Do not install PEAR], DEFAULT, yes)

 if test $PHP_PEAR != no; then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt trunk/ext/curl/tests/curl_setopt_array_basic.phpt

2011-12-01 Thread Pierrick Charron

pierrick Fri, 02 Dec 2011 04:16:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=320265

Log:
Cleans up test file

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
U   php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt
U   php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
2011-12-02 03:54:50 UTC (rev 320264)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt
2011-12-02 04:16:46 UTC (rev 320265)
@@ -46,6 +46,7 @@
 curl_close($ch);

 var_dump($returnContent);
+isset($tempname) and is_file($tempname) and @unlink($tempname);

 ?
 --EXPECT--

Modified: 
php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt
2011-12-02 03:54:50 UTC (rev 320264)
+++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt
2011-12-02 04:16:46 UTC (rev 320265)
@@ -46,6 +46,7 @@
 curl_close($ch);

 var_dump($returnContent);
+isset($tempname) and is_file($tempname) and @unlink($tempname);

 ?
 --EXPECT--

Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt   
2011-12-02 03:54:50 UTC (rev 320264)
+++ php/php-src/trunk/ext/curl/tests/curl_setopt_array_basic.phpt   
2011-12-02 04:16:46 UTC (rev 320265)
@@ -46,6 +46,7 @@
 curl_close($ch);

 var_dump($returnContent);
+isset($tempname) and is_file($tempname) and @unlink($tempname);

 ?
 --EXPECT--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_hash.c trunk/Zend/zend_hash.c

[PHP-CVS] svn: /php/php-src/trunk/ext/standard/tests/array/ array_change_key_case_variation8.phpt arsort_variation5.phpt asort_variation5.phpt krsort_variation5.phpt ksort_variation5.phpt natcasesort_

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/standard/tests/array/ array_change_key_case_variation8.phpt arsort_variation5.phpt asort_variation5.phpt krsort_variation5.phpt ksort_variation5.phpt n

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/strings/strrchr_variation5.phpt branches/PHP_5_4/ext/standard/tests/strings/strspn_variation6.phpt branches/PHP_5_4/ext/standard/tests/

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/run-tests.php branches/PHP_5_4/run-tests.php trunk/run-tests.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/configure.in trunk/configure.in

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_setopt_array_basic.phpt branches/PHP_5_4/ext/curl/tests/curl_setopt_array_basic.phpt trunk/ext/curl/tests/curl_setopt_array_basic.phpt

7 matches

Site Navigation

Mail list logo

Footer information