[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt tru

[Gustavo André dos Santos Lopes]

cataphract   Wed, 31 Aug 2011 06:23:24 +

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

Log:
- Fixed tests when run from outside their directory.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
U   
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
U   
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
U   
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
 2011-08-31 06:00:57 UTC (rev 315848)
+++ 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
 2011-08-31 06:23:24 UTC (rev 315849)
@@ -4,6 +4,7 @@
 ?php if (!extension_loaded('dom')) die('skip'); ?
 --FILE--
 ?php
+chdir(__DIR__);
 $xml = XML
 !DOCTYPE foo PUBLIC -//FOO/BAR http://example.com/foobar;
 foobarfooz;/foo

Modified: 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
 2011-08-31 06:00:57 UTC (rev 315848)
+++ 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
 2011-08-31 06:23:24 UTC (rev 315849)
@@ -7,6 +7,7 @@
 @unlink(__DIR__ . /foobar.dtd);
 --FILE--
 ?php
+chdir(__DIR__);
 $xml = XML
 !DOCTYPE foo PUBLIC -//FOO/BAR foobar.dtd
 foobar/foo

Modified: 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
===
--- 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
2011-08-31 06:00:57 UTC (rev 315848)
+++ 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
2011-08-31 06:23:24 UTC (rev 315849)
@@ -4,6 +4,7 @@
 ?php if (!extension_loaded('dom')) die('skip'); ?
 --FILE--
 ?php
+chdir(__DIR__);
 $xml = XML
 !DOCTYPE foo PUBLIC -//FOO/BAR http://example.com/foobar;
 foobarfooz;/foo

Modified: 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
===
--- 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
2011-08-31 06:00:57 UTC (rev 315848)
+++ 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
2011-08-31 06:23:24 UTC (rev 315849)
@@ -7,6 +7,7 @@
 @unlink(__DIR__ . /foobar.dtd);
 --FILE--
 ?php
+chdir(__DIR__);
 $xml = XML
 !DOCTYPE foo PUBLIC -//FOO/BAR foobar.dtd
 foobar/foo

-- 
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/ext/standard/tests/strings/htmlentities15.phpt trunk/ext/standard/tests/strings/htmlentities15.phpt

[Gustavo André dos Santos Lopes]

cataphract   Wed, 31 Aug 2011 06:32:05 +

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

Log:
- Fixed test htmlentities15.phpt.

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

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt 
2011-08-31 06:26:39 UTC (rev 315850)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt 
2011-08-31 06:32:05 UTC (rev 315851)
@@ -11,6 +11,9 @@
die(skip setlocale() failed\n);
 }
 ?
+--COMMENT--
+As of PHP 5.4, htmlentities() no longer makes replacements with numerical
+entities. Hence, for this input there's no substitution.
 --FILE--
 ?php
 setlocale(LC_CTYPE, ru_RU.koi8r, ru_RU.KOI8-R);
@@ -19,4 +22,4 @@
 ?
 --EXPECT--
 string(9) �
-string(63) #1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+string(9) �

Modified: php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt
===
--- php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt
2011-08-31 06:26:39 UTC (rev 315850)
+++ php/php-src/trunk/ext/standard/tests/strings/htmlentities15.phpt
2011-08-31 06:32:05 UTC (rev 315851)
@@ -11,6 +11,9 @@
die(skip setlocale() failed\n);
 }
 ?
+--COMMENT--
+As of PHP 5.4, htmlentities() no longer makes replacements with numerical
+entities. Hence, for this input there's no substitution.
 --FILE--
 ?php
 setlocale(LC_CTYPE, ru_RU.koi8r, ru_RU.KOI8-R);
@@ -19,4 +22,4 @@
 ?
 --EXPECT--
 string(9) �
-string(63) #1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+string(9) �

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt trunk/ext/standard/tests/strings/htmlentities15.phpt

[Stas Malyshev]

Hi!

On 8/30/11 11:32 PM, Gustavo André dos Santos Lopes wrote:

cataphract   Wed, 31 Aug 2011 06:32:05 +

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

Log:
- Fixed test htmlentities15.phpt.

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

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt 
2011-08-31 06:26:39 UTC (rev 315850)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt 
2011-08-31 06:32:05 UTC (rev 315851)
@@ -11,6 +11,9 @@
die(skip setlocale() failed\n);
  }
  ?
+--COMMENT--
+As of PHP 5.4, htmlentities() no longer makes replacements with numerical
+entities. Hence, for this input there's no substitution.
  --FILE--
  ?php
  setlocale(LC_CTYPE, ru_RU.koi8r, ru_RU.KOI8-R);
@@ -19,4 +22,4 @@
  ?
  --EXPECT--
  string(9) �
-string(63) #1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;
+string(9) �


Could you explain what this test is doing and why? What '' encoding 
means (docs say nothing of it), why we set locale to KOI8-R?

--
Stanislav Malyshev, Software Architect
SugarCRM: http://www.sugarcrm.com/
(408)454-6900 ext. 227

--
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/ext/date/tests/bug33532.phpt branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt branche

[Stanislav Malyshev]

stas Wed, 31 Aug 2011 07:10:17 +

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

Log:
test fixes on Darwin

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt
U   php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt
U   php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt
U   php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/nl_langinfo_variation1.phpt
U   php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtolower.phpt
U   php/php-src/branches/PHP_5_4/ext/standard/tests/strings/strtoupper1.phpt
U   php/php-src/trunk/ext/date/tests/bug33532.phpt
U   php/php-src/trunk/ext/date/tests/gmstrftime_variation22.phpt
U   php/php-src/trunk/ext/date/tests/strftime_variation22.phpt
U   php/php-src/trunk/ext/standard/tests/math/bug45712.phpt
U   php/php-src/trunk/ext/standard/tests/strings/nl_langinfo_variation1.phpt
U   php/php-src/trunk/ext/standard/tests/strings/strtolower.phpt
U   php/php-src/trunk/ext/standard/tests/strings/strtoupper1.phpt

Modified: php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt	2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/bug33532.phpt	2011-08-31 07:10:17 UTC (rev 315855)
@@ -3,6 +3,9 @@
 --INI--
 error_reporting=2047
 date.timezone=UTC
+--SKIPIF--
+?php
+if(PHP_OS == 'Darwin') die(skip strftime depends on TZ on Darwin);
 --FILE--
 ?php

@@ -18,6 +21,7 @@

 print \nSetting TZ\n;
 date_default_timezone_set('Australia/Sydney');
+putenv(TZ=Australia/Sydney);
 $input = 10:00:00 AM July 1 2005;
 print input . $input . \n;
 $tStamp = strtotime($input);

Modified: php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt	2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/gmstrftime_variation22.phpt	2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 die(skip Test is not valid for Windows);
 }
-if (!setlocale(LC_ALL, en_US.utf8, en_US)) {
-die(skip Locale en_US or en_US.utf8 is required to run this test);
+if (!setlocale(LC_TIME, POSIX)) {
+die(skip Locale POSIX is required to run this test);
 }
 ?
 --FILE--
@@ -21,7 +21,8 @@

 // Initialise function arguments not being substituted (if any)
 $timestamp = gmmktime(8, 8, 8, 8, 8, 2008);
-setlocale(LC_ALL, en_US.utf8, en_US);
+setlocale(LC_TIME, POSIX);
+putenv(LC_TIME=POSIX);
 date_default_timezone_set(Asia/Calcutta);

 //array of values to iterate over
@@ -46,13 +47,13 @@

 --Preferred date and time representation--
 string(2) %c
-string(31) Fri 08 Aug 2008 08:08:08 AM GMT
+string(24) Fri Aug  8 08:08:08 2008

 --Preferred date representation--
 string(2) %x
-string(10) 08/08/2008
+string(8) 08/08/08

 --Preferred time representation--
 string(2) %X
-string(11) 08:08:08 AM
+string(8) 08:08:08
 ===DONE===

Modified: php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt
===
--- php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt	2011-08-31 07:03:23 UTC (rev 315854)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/strftime_variation22.phpt	2011-08-31 07:10:17 UTC (rev 315855)
@@ -5,8 +5,8 @@
 if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
 die(skip Test is not valid for Windows);
 }
-if(!setlocale(LC_ALL, en_US.utf8, en_US)) {
-	die(skip Locale en_US.utf8 or en_US is  needed by test and is not available);
+if(!setlocale(LC_ALL, POSIX)) {
+	die(skip Locale POSIX is  needed by test and is not available);
 }
 ?
 --FILE--
@@ -20,7 +20,8 @@
 echo *** Testing strftime() : usage variation ***\n;

 // Initialise function arguments not being substituted (if any)
-setlocale(LC_ALL, en_US.utf8, en_US);
+setlocale(LC_ALL, POSIX);
+putenv(LC_ALL=POSIX);
 date_default_timezone_set(Asia/Calcutta);
 $timestamp = mktime(8, 8, 8, 8, 8, 2008);

@@ -46,13 +47,13 @@

 --Preferred date and time representation--
 string(2) %c
-string(31) Fri 08 Aug 2008 08:08:08 AM IST
+string(24) Fri Aug  8 08:08:08 2008

 --Preferred date representation--
 string(2) %x
-string(10) 08/08/2008
+string(8) 08/08/08

 --Preferred time representation--
 string(2) %X
-string(11) 08:08:08 AM
+string(8) 08:08:08
 ===DONE===

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/math/bug45712.phpt	2011-08-31 07:03:23 UTC (rev 315854)
+++ 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt

[Rasmus Lerdorf]

rasmus   Wed, 31 Aug 2011 07:19:20 +

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

Log:
Fix test. I have no idea why the test author didn't expect to get back
latin2 when the test is setting it to latin2 here. Both PHP and MySQL
are doing the right thing here.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
U   php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 07:10:17 UTC (rev 315855)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 07:19:20 UTC (rev 315856)
@@ -297,4 +297,4 @@
 [009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [017] DSN=%s, SQLSTATE[%s] [%d] %s
-[033] DSN = mysql:%s, character sets has not been set, 
@@character_set_connection reports 'latin1', expecting 'latin2'done!
+done!

Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2011-08-31 07:10:17 UTC (rev 315855)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2011-08-31 07:19:20 UTC (rev 315856)
@@ -297,4 +297,4 @@
 [009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [017] DSN=%s, SQLSTATE[%s] [%d] %s
-[033] DSN = mysql:%s, character sets has not been set, 
@@character_set_connection reports 'latin1', expecting 'latin2'done!
+done!

-- 
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/ext/standard/tests/time/strptime_basic.phpt branches/PHP_5_4/ext/standard/tests/time/strptime_parts.phpt trunk/ext/standard/tests/time/strptime_basic.phpt

[Stanislav Malyshev]

stas Wed, 31 Aug 2011 07:34:07 +

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

Log:
fix strptime tests for mac

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_basic.phpt
A   php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_parts.phpt
U   php/php-src/trunk/ext/standard/tests/time/strptime_basic.phpt
A   php/php-src/trunk/ext/standard/tests/time/strptime_parts.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_basic.phpt
2011-08-31 07:19:20 UTC (rev 315856)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_basic.phpt
2011-08-31 07:34:07 UTC (rev 315857)
@@ -5,6 +5,7 @@
if (!function_exists('strptime')) {
die(skip - strptime() function not available in this build);
}
+if(PHP_OS == 'Darwin') die(skip - strptime() behaves differently on 
Darwin);
 ?

 --FILE--

Added: php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_parts.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_parts.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/time/strptime_parts.phpt
2011-08-31 07:34:07 UTC (rev 315857)
@@ -0,0 +1,76 @@
+--TEST--
+Test strptime() function : basic functionality
+--SKIPIF--
+?php
+   if (!function_exists('strptime')) {
+   die(skip - strptime() function not available in this build);
+   }
+?
+
+--FILE--
+?php
+/* Prototype  : array strptime  ( string $date  , string $format  )
+ * Description:  Parse a time/date generated with strftime()
+ * Source code: ext/standard/datetime.c
+*/
+
+$orig = setlocale(LC_ALL, 'C');
+date_default_timezone_set(GMT);
+putenv(TZ=GMT);
+
+echo *** Testing strptime() : basic functionality ***\n;
+
+$input = 10:01:20 AM July 2 1963;
+$tstamp = strtotime($input);
+
+$str = strftime(%r %B%e %Y %Z, $tstamp);
+$res = strptime($str, '%H:%M:%S %p %B %d %Y %Z');
+var_dump($res[tm_sec]);
+var_dump($res[tm_min]);
+var_dump($res[tm_hour]);
+var_dump($res[tm_mday]);
+var_dump($res[tm_mon]);
+var_dump($res[tm_year]);
+
+$str = strftime(%T %D, $tstamp);
+$res = strptime($str, '%H:%M:%S %m/%d/%y');
+var_dump($res[tm_sec]);
+var_dump($res[tm_min]);
+var_dump($res[tm_hour]);
+var_dump($res[tm_mday]);
+var_dump($res[tm_mon]);
+var_dump($res[tm_year]);
+
+$str = strftime(%A %B %e %R, $tstamp);
+$res = strptime($str, '%A %B %e %R');
+var_dump($res[tm_sec]);
+var_dump($res[tm_min]);
+var_dump($res[tm_hour]);
+var_dump($res[tm_mday]);
+var_dump($res[tm_mon]);
+var_dump($res[tm_year]);
+
+setlocale(LC_ALL, $orig);
+?
+===DONE===
+--EXPECT--
+*** Testing strptime() : basic functionality ***
+int(20)
+int(1)
+int(10)
+int(2)
+int(6)
+int(63)
+int(20)
+int(1)
+int(10)
+int(2)
+int(6)
+int(163)
+int(0)
+int(1)
+int(10)
+int(2)
+int(6)
+int(0)
+===DONE===

Modified: php/php-src/trunk/ext/standard/tests/time/strptime_basic.phpt
===
--- php/php-src/trunk/ext/standard/tests/time/strptime_basic.phpt   
2011-08-31 07:19:20 UTC (rev 315856)
+++ php/php-src/trunk/ext/standard/tests/time/strptime_basic.phpt   
2011-08-31 07:34:07 UTC (rev 315857)
@@ -5,6 +5,7 @@
if (!function_exists('strptime')) {
die(skip - strptime() function not available in this build);
}
+if(PHP_OS == 'Darwin') die(skip - strptime() behaves differently on 
Darwin);
 ?

 --FILE--

Added: php/php-src/trunk/ext/standard/tests/time/strptime_parts.phpt
===
--- php/php-src/trunk/ext/standard/tests/time/strptime_parts.phpt   
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/time/strptime_parts.phpt   
2011-08-31 07:34:07 UTC (rev 315857)
@@ -0,0 +1,76 @@
+--TEST--
+Test strptime() function : basic functionality
+--SKIPIF--
+?php
+   if (!function_exists('strptime')) {
+   die(skip - strptime() function not available in this build);
+   }
+?
+
+--FILE--
+?php
+/* Prototype  : array strptime  ( string $date  , string $format  )
+ * Description:  Parse a time/date generated with strftime()
+ * Source code: ext/standard/datetime.c
+*/
+
+$orig = setlocale(LC_ALL, 'C');
+date_default_timezone_set(GMT);
+putenv(TZ=GMT);
+
+echo *** Testing strptime() : basic functionality ***\n;
+
+$input = 10:01:20 AM July 2 1963;
+$tstamp = strtotime($input);
+
+$str = strftime(%r %B%e %Y %Z, $tstamp);
+$res = strptime($str, '%H:%M:%S %p %B %d %Y %Z');
+var_dump($res[tm_sec]);
+var_dump($res[tm_min]);
+var_dump($res[tm_hour]);
+var_dump($res[tm_mday]);
+var_dump($res[tm_mon]);
+var_dump($res[tm_year]);
+
+$str = strftime(%T %D, 

[PHP-CVS] svn: /php/php-src/trunk/ext/xsl/tests/ exslt.xml xslt010.phpt

[Christian Stocker]

chregu   Wed, 31 Aug 2011 07:38:19 +

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

Log:
MFB. fix xsl date tests

Changed paths:
U   php/php-src/trunk/ext/xsl/tests/exslt.xml
U   php/php-src/trunk/ext/xsl/tests/xslt010.phpt

Modified: php/php-src/trunk/ext/xsl/tests/exslt.xml
===
--- php/php-src/trunk/ext/xsl/tests/exslt.xml   2011-08-31 07:37:42 UTC (rev 
315858)
+++ php/php-src/trunk/ext/xsl/tests/exslt.xml   2011-08-31 07:38:19 UTC (rev 
315859)
@@ -6,4 +6,10 @@
   date date=2000-02-29/
   date date=9990001-12-31Z/
   date date=-0004-02-29/
+  date date=1999-01-02/
+  date date=1999-01-03/
+  date date=2004-01-01/
+  date date=2006-01-01/
+  date date=2007-12-31/
 /page
+

Modified: php/php-src/trunk/ext/xsl/tests/xslt010.phpt
===
--- php/php-src/trunk/ext/xsl/tests/xslt010.phpt2011-08-31 07:37:42 UTC 
(rev 315858)
+++ php/php-src/trunk/ext/xsl/tests/xslt010.phpt2011-08-31 07:38:19 UTC 
(rev 315859)
@@ -30,7 +30,7 @@
 month-in-year: 12
 month-name   : December
 month-abbreviation   : Dec
-week-in-year : 53
+week-in-year : 1
 day-in-year  : 365
 day-in-month : 31
 day-of-week-in-month : 5
@@ -84,7 +84,7 @@
 month-in-year: 12
 month-name   : December
 month-abbreviation   : Dec
-week-in-year : 53
+week-in-year : 1
 day-in-year  : 365
 day-in-month : 31
 day-of-week-in-month : 5
@@ -102,7 +102,7 @@
 month-in-year: 2
 month-name   : February
 month-abbreviation   : Feb
-week-in-year : 10
+week-in-year : 9
 day-in-year  : 60
 day-in-month : 29
 day-of-week-in-month : 5
@@ -113,4 +113,94 @@
 hour-in-day  : NaN
 minute-in-hour   : NaN
 second-in-minute : NaN
+
+  Test Date : 1999-01-02
+year : 1999
+leap-year: false
+month-in-year: 1
+month-name   : January
+month-abbreviation   : Jan
+week-in-year : 53
+day-in-year  : 2
+day-in-month : 2
+day-of-week-in-month : 1
+day-in-week  : 7
+day-name : Saturday
+day-abbreviation : Sat
+time :
+hour-in-day  : NaN
+minute-in-hour   : NaN
+second-in-minute : NaN
+
+  Test Date : 1999-01-03
+year : 1999
+leap-year: false
+month-in-year: 1
+month-name   : January
+month-abbreviation   : Jan
+week-in-year : 53
+day-in-year  : 3
+day-in-month : 3
+day-of-week-in-month : 1
+day-in-week  : 1
+day-name : Sunday
+day-abbreviation : Sun
+time :
+hour-in-day  : NaN
+minute-in-hour   : NaN
+second-in-minute : NaN
+
+  Test Date : 2004-01-01
+year : 2004
+leap-year: true
+month-in-year: 1
+month-name   : January
+month-abbreviation   : Jan
+week-in-year : 1
+day-in-year  : 1
+day-in-month : 1
+day-of-week-in-month : 1
+day-in-week  : 5
+day-name : Thursday
+day-abbreviation : Thu
+time :
+hour-in-day  : NaN
+minute-in-hour   : NaN
+second-in-minute : NaN
+
+  Test Date : 2006-01-01
+year : 2006
+leap-year: false
+month-in-year: 1
+month-name   : January
+month-abbreviation   : Jan
+week-in-year : 52
+day-in-year  : 1
+day-in-month : 1
+day-of-week-in-month : 1
+day-in-week  : 1
+day-name : Sunday
+day-abbreviation : Sun
+time :
+hour-in-day  : NaN
+minute-in-hour   : NaN
+second-in-minute : NaN
+
+  Test Date : 2007-12-31
+year : 2007
+leap-year: false
+month-in-year: 12
+month-name   : December
+month-abbreviation   : Dec
+week-in-year : 1
+day-in-year  : 365
+day-in-month : 31
+day-of-week-in-month : 5
+day-in-week  : 2
+day-name : Monday
+day-abbreviation : Mon
+time :
+hour-in-day  : NaN
+minute-in-hour   : NaN
+second-in-minute : NaN


-- 
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/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt

[Rasmus Lerdorf]

rasmus   Wed, 31 Aug 2011 07:43:58 +

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

Log:
Since we are creating this csv file locally this should obviously
be a a LOCAL infile here for this to work reliably. For robustness
this should probably have a check for the local-infile server
setting as well.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
U   php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt  
2011-08-31 07:38:19 UTC (rev 315859)
+++ 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt  
2011-08-31 07:43:58 UTC (rev 315860)
@@ -69,7 +69,7 @@
fwrite($fp, b2;bar);
fclose($fp);

-   $sql = sprintf(LOAD DATA INFILE %s INTO TABLE test FIELDS 
TERMINATED BY ';' LINES TERMINATED  BY '\n', $db-quote($filename));
+   $sql = sprintf(LOAD DATA LOCAL INFILE %s INTO TABLE test 
FIELDS TERMINATED BY ';' LINES TERMINATED  BY '\n', $db-quote($filename));

if (exec_and_count(4, $db, $sql, 2)) {

@@ -105,4 +105,4 @@
 $db-exec('DROP TABLE IF EXISTS test');
 ?
 --EXPECTF--
-done!
\ No newline at end of file
+done!

Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt 
2011-08-31 07:38:19 UTC (rev 315859)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_exec_load_data.phpt 
2011-08-31 07:43:58 UTC (rev 315860)
@@ -69,7 +69,7 @@
fwrite($fp, b2;bar);
fclose($fp);

-   $sql = sprintf(LOAD DATA INFILE %s INTO TABLE test FIELDS 
TERMINATED BY ';' LINES TERMINATED  BY '\n', $db-quote($filename));
+   $sql = sprintf(LOAD DATA LOCAL INFILE %s INTO TABLE test 
FIELDS TERMINATED BY ';' LINES TERMINATED  BY '\n', $db-quote($filename));

if (exec_and_count(4, $db, $sql, 2)) {

@@ -105,4 +105,4 @@
 $db-exec('DROP TABLE IF EXISTS test');
 ?
 --EXPECTF--
-done!
\ No newline at end of file
+done!

-- 
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/general_functions/ parse_ini_file.phpt

[Xinchen Hui]

laruence Wed, 31 Aug 2011 07:49:52 +

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

Log:
Fixed test failed

Changed paths:
U   
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt

Modified: 
php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt  
2011-08-31 07:43:58 UTC (rev 315860)
+++ php/php-src/trunk/ext/standard/tests/general_functions/parse_ini_file.phpt  
2011-08-31 07:49:52 UTC (rev 315861)
@@ -205,6 +205,8 @@
   [foo_]=
   string(4) bar3
 }
+
+Deprecated: Comments starting with '#' are deprecated in %s
 array(3) {
   [foo]=
   string(4) bar1

-- 
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/snmp/ snmp.c tests/snmp-object.phpt tests/snmp3-error.phpt

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 08:28:13 +

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

Log:
more tuning based on discussion in FR #40816:
 * parse all OIDs earlier, detect all wrong OIDs before any query
   is made (GET-operations)
 * introduce ERRNO_MULTIPLE_SET_QUERIES:
warn if request contains more OIDs than max_oids and SET operation
(and typevalue checks) will be done in chunks.
fix set method when request contains more OIDs than max_oids (2nd and
 subsequent chunk were ignored)

Bug: https://bugs.php.net/40816 (Feedback) Add snmptranslate function
  
Changed paths:
U   php/php-src/trunk/ext/snmp/snmp.c
U   php/php-src/trunk/ext/snmp/tests/snmp-object.phpt
U   php/php-src/trunk/ext/snmp/tests/snmp3-error.phpt

Modified: php/php-src/trunk/ext/snmp/snmp.c
===
--- php/php-src/trunk/ext/snmp/snmp.c	2011-08-31 07:49:52 UTC (rev 315861)
+++ php/php-src/trunk/ext/snmp/snmp.c	2011-08-31 08:28:13 UTC (rev 315862)
@@ -118,6 +118,7 @@
 #define PHP_SNMP_ERRNO_ERROR_IN_REPLY	3
 #define PHP_SNMP_ERRNO_OID_NOT_INCREASING 4
 #define PHP_SNMP_ERRNO_OID_PARSING_ERROR 5
+#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES 6

 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);
@@ -685,11 +686,8 @@
 	struct snmp_session *ss;
 	struct snmp_pdu *pdu=NULL, *response;
 	struct variable_list *vars;
-	oid name[MAX_NAME_LEN];
-	size_t name_length;
 	oid root[MAX_NAME_LEN];
 	size_t rootlen = 0;
-	int gotroot = 0;
 	int status, count, found;
 	char buf[2048];
 	char buf2[2048];
@@ -704,35 +702,10 @@
 	/* reset errno and errstr */
 	php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_NOERROR, );

-	if (st  SNMP_CMD_WALK) {
-		if (objid_query-count  1) {
-			php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Multi OID walks are not supported!);
-			RETURN_FALSE;
-		}
-		rootlen = MAX_NAME_LEN;
-		if (strlen(objid_query-vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
-			if (snmp_parse_oid(objid_query-vars[0].oid, root, rootlen)) {
-gotroot = 1;
-			} else {
-php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Invalid object identifier: %s, objid_query-vars[0].oid);
-RETVAL_FALSE;
-return;
-			}
-		}
-
-		if (!gotroot) {
-			memmove((char *) root, (char *) objid_mib, sizeof(objid_mib));
-			rootlen = sizeof(objid_mib) / sizeof(oid);
-			gotroot = 1;
-		}
-
-		memmove((char *)name, (char *)root, rootlen * sizeof(oid));
-		name_length = rootlen;
+	if (st  SNMP_CMD_WALK) { /* remember root OID */
+		memmove((char *)root, (char *)(objid_query-vars[0].name), (objid_query-vars[0].name_length) * sizeof(oid));
+		rootlen = objid_query-vars[0].name_length;
 		objid_query-offset = objid_query-count;
-
-		memmove((char *)objid_query-vars[0].name, (char *)root, rootlen * sizeof(oid));
-		objid_query-vars[0].name_length = rootlen;
-
 	}

 	if ((ss = snmp_open(session)) == NULL) {
@@ -743,6 +716,10 @@
 		return;
 	}

+	if ((st  SNMP_CMD_SET)  objid_query-count  objid_query-step) {
+		php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES, Can not fit all OIDs for SET query into one packet, using multiple queries);
+	}
+
 	while (keepwalking) {
 		keepwalking = 0;
 		if (st  SNMP_CMD_WALK) {
@@ -753,7 +730,7 @@
 pdu-non_repeaters = objid_query-non_repeaters;
 pdu-max_repetitions = objid_query-max_repetitions;
 			}
-			snmp_add_null_var(pdu, name, name_length);
+			snmp_add_null_var(pdu, objid_query-vars[0].name, objid_query-vars[0].name_length);
 		} else {
 			if (st  SNMP_CMD_GET) {
 pdu = snmp_pdu_create(SNMP_MSG_GET);
@@ -768,14 +745,6 @@
 return;
 			}
 			for (count = 0; objid_query-offset  objid_query-count  count  objid_query-step; objid_query-offset++, count++){
-objid_query-vars[objid_query-offset].name_length = MAX_OID_LEN;
-if (!snmp_parse_oid(objid_query-vars[objid_query-offset].oid, objid_query-vars[objid_query-offset].name, (objid_query-vars[objid_query-offset].name_length))) {
-	php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Invalid object identifier: %s, objid_query-vars[objid_query-offset].oid);
-	snmp_free_pdu(pdu);
-	snmp_close(ss);
-	RETVAL_FALSE;
-	return;
-}
 if (st  SNMP_CMD_SET) {
 	if ((snmp_errno = snmp_add_var(pdu, objid_query-vars[objid_query-offset].name, objid_query-vars[objid_query-offset].name_length, objid_query-vars[objid_query-offset].type, objid_query-vars[objid_query-offset].value))) {
 		snprint_objid(buf, sizeof(buf), objid_query-vars[objid_query-offset].name, objid_query-vars[objid_query-offset].name_length);
@@ -802,6 +771,10 @@
 		if (status == STAT_SUCCESS) {
 			if (response-errstat == SNMP_ERR_NOERROR) {
 if (st  SNMP_CMD_SET) {
+	if (objid_query-offset  objid_query-count) { /* we have unprocessed OIDs */
+		keepwalking = 1;
+		

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

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 08:35:57 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/bug48930.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/bug48930.phpt
_U  php/php-src/trunk/Zend/tests/bug48930.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/bug48930.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug48930.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/bug48930.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/ext/snmp/ snmp.c tests/snmp-object.phpt tests/snmp3-error.phpt

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 08:36:22 +

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

Log:
more tuning based on discussion in FR #40816:
 * parse all OIDs earlier, detect all wrong OIDs before any query
   is made (GET-operations)
 * introduce ERRNO_MULTIPLE_SET_QUERIES:
warn if request contains more OIDs than max_oids and SET operation
(and typevalue checks) will be done in chunks.
fix set method when request contains more OIDs than max_oids (2nd and
 subsequent chunk were ignored)

Bug: https://bugs.php.net/40816 (Feedback) Add snmptranslate function
  
Changed paths:
_U  php/php-src/branches/PHP_5_4/ext/snmp/
U   php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
_U  php/php-src/branches/PHP_5_4/ext/snmp/tests/
U   php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object.phpt
U   php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp3-error.phpt


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp
___
Modified: svn:mergeinfo
   - /php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608
   + /php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608,315862

Modified: php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_4/ext/snmp/snmp.c	2011-08-31 08:35:57 UTC (rev 315864)
+++ php/php-src/branches/PHP_5_4/ext/snmp/snmp.c	2011-08-31 08:36:22 UTC (rev 315865)
@@ -110,6 +110,7 @@
 #define PHP_SNMP_ERRNO_ERROR_IN_REPLY	3
 #define PHP_SNMP_ERRNO_OID_NOT_INCREASING 4
 #define PHP_SNMP_ERRNO_OID_PARSING_ERROR 5
+#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES 6

 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);
@@ -670,11 +671,8 @@
 	struct snmp_session *ss;
 	struct snmp_pdu *pdu=NULL, *response;
 	struct variable_list *vars;
-	oid name[MAX_NAME_LEN];
-	size_t name_length;
 	oid root[MAX_NAME_LEN];
 	size_t rootlen = 0;
-	int gotroot = 0;
 	int status, count, found;
 	char buf[2048];
 	char buf2[2048];
@@ -689,35 +687,10 @@
 	/* reset errno and errstr */
 	php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_NOERROR, );

-	if (st  SNMP_CMD_WALK) {
-		if (objid_query-count  1) {
-			php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Multi OID walks are not supported!);
-			RETURN_FALSE;
-		}
-		rootlen = MAX_NAME_LEN;
-		if (strlen(objid_query-vars[0].oid)) { /* on a walk, an empty string means top of tree - no error */
-			if (snmp_parse_oid(objid_query-vars[0].oid, root, rootlen)) {
-gotroot = 1;
-			} else {
-php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Invalid object identifier: %s, objid_query-vars[0].oid);
-RETVAL_FALSE;
-return;
-			}
-		}
-
-		if (!gotroot) {
-			memmove((char *) root, (char *) objid_mib, sizeof(objid_mib));
-			rootlen = sizeof(objid_mib) / sizeof(oid);
-			gotroot = 1;
-		}
-
-		memmove((char *)name, (char *)root, rootlen * sizeof(oid));
-		name_length = rootlen;
+	if (st  SNMP_CMD_WALK) { /* remember root OID */
+		memmove((char *)root, (char *)(objid_query-vars[0].name), (objid_query-vars[0].name_length) * sizeof(oid));
+		rootlen = objid_query-vars[0].name_length;
 		objid_query-offset = objid_query-count;
-
-		memmove((char *)objid_query-vars[0].name, (char *)root, rootlen * sizeof(oid));
-		objid_query-vars[0].name_length = rootlen;
-
 	}

 	if ((ss = snmp_open(session)) == NULL) {
@@ -728,6 +701,10 @@
 		return;
 	}

+	if ((st  SNMP_CMD_SET)  objid_query-count  objid_query-step) {
+		php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES, Can not fit all OIDs for SET query into one packet, using multiple queries);
+	}
+
 	while (keepwalking) {
 		keepwalking = 0;
 		if (st  SNMP_CMD_WALK) {
@@ -738,7 +715,7 @@
 pdu-non_repeaters = objid_query-non_repeaters;
 pdu-max_repetitions = objid_query-max_repetitions;
 			}
-			snmp_add_null_var(pdu, name, name_length);
+			snmp_add_null_var(pdu, objid_query-vars[0].name, objid_query-vars[0].name_length);
 		} else {
 			if (st  SNMP_CMD_GET) {
 pdu = snmp_pdu_create(SNMP_MSG_GET);
@@ -753,14 +730,6 @@
 return;
 			}
 			for (count = 0; objid_query-offset  objid_query-count  count  objid_query-step; objid_query-offset++, count++){
-objid_query-vars[objid_query-offset].name_length = MAX_OID_LEN;
-if (!snmp_parse_oid(objid_query-vars[objid_query-offset].oid, objid_query-vars[objid_query-offset].name, (objid_query-vars[objid_query-offset].name_length))) {
-	php_snmp_error(getThis(), NULL TSRMLS_CC, PHP_SNMP_ERRNO_OID_PARSING_ERROR, Invalid object identifier: %s, objid_query-vars[objid_query-offset].oid);
-	snmp_free_pdu(pdu);
-	snmp_close(ss);
-	RETVAL_FALSE;
-	return;
-}
 if (st  SNMP_CMD_SET) {
 	if ((snmp_errno = snmp_add_var(pdu, objid_query-vars[objid_query-offset].name, objid_query-vars[objid_query-offset].name_length, 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt tru

[Christian Stocker]

chregu   Wed, 31 Aug 2011 08:58:12 +

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

Log:
fixed libxml tests

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
U   
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
U   
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
U   
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
 2011-08-31 08:36:22 UTC (rev 315865)
+++ 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
 2011-08-31 08:58:12 UTC (rev 315866)
@@ -48,7 +48,7 @@
 string(25) http://example.com/foobar;
 array(4) {
   [directory]=
-  string(36) %s
+  string(%d) %s
   [intSubName]=
   string(3) foo
   [extSubURI]=
@@ -60,7 +60,7 @@
 string(32) http://example.com/fooentity.ent;
 array(4) {
   [directory]=
-  string(36) %s
+  string(%d) %s
   [intSubName]=
   string(3) foo
   [extSubURI]=

Modified: 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
 2011-08-31 08:36:22 UTC (rev 315865)
+++ 
php/php-src/branches/PHP_5_4/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
 2011-08-31 08:58:12 UTC (rev 315866)
@@ -37,7 +37,7 @@

 --EXPECTF--
 string(10) -//FOO/BAR
-string(46) %sfoobar.dtd
+string(%d) %sfoobar.dtd

 Warning: DOMDocument::validate(): Could not load the external subset 
foobar.dtd in %s on line %d
 bool(false)

Modified: 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
===
--- 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
2011-08-31 08:36:22 UTC (rev 315865)
+++ 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation1.phpt
2011-08-31 08:58:12 UTC (rev 315866)
@@ -48,7 +48,7 @@
 string(25) http://example.com/foobar;
 array(4) {
   [directory]=
-  string(36) %s
+  string(%d) %s
   [intSubName]=
   string(3) foo
   [extSubURI]=
@@ -60,7 +60,7 @@
 string(32) http://example.com/fooentity.ent;
 array(4) {
   [directory]=
-  string(36) %s
+  string(%d) %s
   [intSubName]=
   string(3) foo
   [extSubURI]=

Modified: 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
===
--- 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
2011-08-31 08:36:22 UTC (rev 315865)
+++ 
php/php-src/trunk/ext/libxml/tests/libxml_set_external_entity_loader_variation2.phpt
2011-08-31 08:58:12 UTC (rev 315866)
@@ -37,7 +37,7 @@

 --EXPECTF--
 string(10) -//FOO/BAR
-string(46) %sfoobar.dtd
+string(%d) %sfoobar.dtd

 Warning: DOMDocument::validate(): Could not load the external subset 
foobar.dtd in %s on line %d
 bool(false)

-- 
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/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt branch

[Christian Stocker]

chregu   Wed, 31 Aug 2011 09:14:08 +

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

Log:
- Set an empty string and avoid warnings and stopping of the transformation 
process
when a php function can't be called.
- Fixed tests.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
U   
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
U   php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c
U   
php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
U   
php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
U   php/php-src/trunk/ext/xsl/xsltprocessor.c

Modified: 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
 2011-08-31 08:58:12 UTC (rev 315866)
+++ 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
 2011-08-31 09:14:08 UTC (rev 315867)
@@ -25,13 +25,7 @@
 NULL

 Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s 
on line %d
-
-Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation 
failed in %s on line %d
-
-Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d 
element value-of in %s on line %d
-
-Warning: XSLTProcessor::transformToXml(): xsltValueOf: text copy failed in %s 
on line %d
-bool(false)
+NULL
 --CREDITS--
 Christian Weiske, cwei...@php.net
 PHP Testfest Berlin 2009-05-09

Modified: 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
2011-08-31 08:58:12 UTC (rev 315866)
+++ 
php/php-src/branches/PHP_5_4/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
2011-08-31 09:14:08 UTC (rev 315867)
@@ -24,13 +24,7 @@
 NULL

 Warning: XSLTProcessor::transformToXml(): Unable to call handler 
undefinedfunc() in %s on line %d
-
-Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation 
failed in %s on line %d
-
-Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d 
element value-of in %s on line %d
-
-Warning: XSLTProcessor::transformToXml(): xsltValueOf: text copy failed in %s 
on line %d
-bool(false)
+NULL
 --CREDITS--
 Christian Weiske, cwei...@php.net
 PHP Testfest Berlin 2009-05-09

Modified: php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c
===
--- php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-31 
08:58:12 UTC (rev 315866)
+++ php/php-src/branches/PHP_5_4/ext/xsl/xsltprocessor.c2011-08-31 
09:14:08 UTC (rev 315867)
@@ -302,6 +302,7 @@
if (obj-stringval == NULL) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Handler name must 
be a string);
xmlXPathFreeObject(obj);
+   valuePush(ctxt, xmlXPathNewString());
if (fci.param_count  0) {
for (i = 0; i  nargs - 1; i++) {
zval_ptr_dtor(args[i]);
@@ -323,7 +324,7 @@
/*fci.function_handler_cache = function_ptr;*/
if (!zend_make_callable(handler, callable TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to call 
handler %s(), callable);
-
+   valuePush(ctxt, xmlXPathNewString());
} else if ( intern-registerPhpFunctions == 2  
zend_hash_exists(intern-registered_phpfunctions, callable, strlen(callable) + 
1) == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Not allowed to 
call handler '%s()', callable);
/* Push an empty string, so that we at least have an xslt 
result... */
@@ -333,6 +334,7 @@
if (result == FAILURE) {
if (Z_TYPE(handler) == IS_STRING) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Unable to call handler %s(), Z_STRVAL_P(handler));
+   valuePush(ctxt, xmlXPathNewString());
}
/* retval is == NULL, when an exception occured, don't report 
anything, because PHP itself will handle that */
} else if (retval == NULL) {

Modified: 
php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
===
--- 
php/php-src/trunk/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
2011-08-31 08:58:12 UTC (rev 315866)
+++ 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/xsl/tests/ xsltprocessor_registerPHPFunctions-funcnostring.phpt xsltprocessor_registerPHPFunctions-funcundef.phpt

[Christian Stocker]

chregu   Wed, 31 Aug 2011 09:16:04 +

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

Log:
fix xsl tests

Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
U   
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
 2011-08-31 09:14:08 UTC (rev 315867)
+++ 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
 2011-08-31 09:16:04 UTC (rev 315868)
@@ -30,8 +30,8 @@

 Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d 
element value-of in %s on line %d

-Warning: XSLTProcessor::transformToXml(): xsltValueOf: text copy failed in %s 
on line %d
-bool(false)
+Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. 
in %s on line %d
+NULL
 --CREDITS--
 Christian Weiske, cwei...@php.net
 PHP Testfest Berlin 2009-05-09

Modified: 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
2011-08-31 09:14:08 UTC (rev 315867)
+++ 
php/php-src/branches/PHP_5_3/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
2011-08-31 09:16:04 UTC (rev 315868)
@@ -29,8 +29,8 @@

 Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d 
element value-of in %s on line %d

-Warning: XSLTProcessor::transformToXml(): xsltValueOf: text copy failed in %s 
on line %d
-bool(false)
+Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. 
in %s on line %d
+NULL
 --CREDITS--
 Christian Weiske, cwei...@php.net
 PHP Testfest Berlin 2009-05-09

-- 
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/Zend/tests/bug48693.phpt branches/PHP_5_4/Zend/tests/bug48693.phpt trunk/Zend/tests/bug48693.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:05:54 +

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

Log:
- make it parser version independent

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt
U   php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt
U   php/php-src/trunk/Zend/tests/bug48693.phpt

Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt   2011-08-31 
09:16:04 UTC (rev 315868)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug48693.phpt   2011-08-31 
10:05:54 UTC (rev 315869)
@@ -18,9 +18,9 @@

 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function 
on line 1
+Parse error: %s in %s(%d) : runtime-created function on line 1

-Parse error: syntax error, unexpected $end in %s(%d) : runtime-created 
function on line 1
+Parse error: %s %s(%d) : runtime-created function on line 1
 bool(false)
 int(2)
 bool(false)

Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt   2011-08-31 
09:16:04 UTC (rev 315868)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug48693.phpt   2011-08-31 
10:05:54 UTC (rev 315869)
@@ -18,9 +18,9 @@

 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function 
on line 1
+Parse error: %s in %s(%d) : runtime-created function on line 1

-Parse error: syntax error, unexpected end of file in %s(%d) : runtime-created 
function on line 1
+Parse error: %s %s(%d) : runtime-created function on line 1
 bool(false)
 int(2)
 bool(false)

Modified: php/php-src/trunk/Zend/tests/bug48693.phpt
===
--- php/php-src/trunk/Zend/tests/bug48693.phpt  2011-08-31 09:16:04 UTC (rev 
315868)
+++ php/php-src/trunk/Zend/tests/bug48693.phpt  2011-08-31 10:05:54 UTC (rev 
315869)
@@ -18,9 +18,9 @@

 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '}' in %s(%d) : runtime-created function 
on line 1
+Parse error: %s in %s(%d) : runtime-created function on line 1

-Parse error: syntax error, unexpected end of file in %s(%d) : runtime-created 
function on line 1
+Parse error: %s %s(%d) : runtime-created function on line 1
 bool(false)
 int(2)
 bool(false)

-- 
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/Zend/tests/bug35655.phpt branches/PHP_5_4/Zend/tests/bug35655.phpt trunk/Zend/tests/bug35655.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:08:55 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/bug35655.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/bug35655.phpt
_U  php/php-src/trunk/Zend/tests/bug35655.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/bug35655.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/bug35655.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/bug35655.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/tests/bug52041.phpt trunk/Zend/tests/bug52041.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:22:18 +

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

Log:
- use only test name

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt
U   php/php-src/trunk/Zend/tests/bug52041.phpt

Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt   2011-08-31 
10:09:54 UTC (rev 315871)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt   2011-08-31 
10:22:18 UTC (rev 315872)
@@ -51,7 +51,7 @@

 Notice: Undefined variable: x in %sbug52041.php on line 3

-Notice: Undefined variable: x in %stests/bug52041.php on line 3
+Notice: Undefined variable: x in %sbug52041.php on line 3

 Notice: Undefined offset: 0 in %sbug52041.php on line 15


Modified: php/php-src/trunk/Zend/tests/bug52041.phpt
===
--- php/php-src/trunk/Zend/tests/bug52041.phpt  2011-08-31 10:09:54 UTC (rev 
315871)
+++ php/php-src/trunk/Zend/tests/bug52041.phpt  2011-08-31 10:22:18 UTC (rev 
315872)
@@ -51,7 +51,7 @@

 Notice: Undefined variable: x in %sbug52041.php on line 3

-Notice: Undefined variable: x in %stests/bug52041.php on line 3
+Notice: Undefined variable: x in %sbug52041.php on line 3

 Notice: Undefined offset: 0 in %sbug52041.php on line 15


-- 
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/Zend/tests/bug54262.phpt branches/PHP_5_4/Zend/tests/bug54262.phpt trunk/Zend/tests/bug54262.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:30:39 +

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

Log:
- use only the test name

Changed paths:
U   php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt
U   php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt
U   php/php-src/trunk/Zend/tests/bug54262.phpt

Modified: php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt
===
--- php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt   2011-08-31 
10:22:18 UTC (rev 315872)
+++ php/php-src/branches/PHP_5_3/Zend/tests/bug54262.phpt   2011-08-31 
10:30:39 UTC (rev 315873)
@@ -11,7 +11,7 @@
 --EXPECTF--
 bool(true)

-Warning: Attempt to modify property of non-object in 
%s/Zend/tests/bug54262.php on line 4
+Warning: Attempt to modify property of non-object in %sbug54262.php on line 4

-Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php 
on line 5
-ok
\ No newline at end of file
+Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5
+ok

Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt   2011-08-31 
10:22:18 UTC (rev 315872)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug54262.phpt   2011-08-31 
10:30:39 UTC (rev 315873)
@@ -11,7 +11,7 @@
 --EXPECTF--
 bool(true)

-Warning: Attempt to modify property of non-object in 
%s/Zend/tests/bug54262.php on line 4
+Warning: Attempt to modify property of non-object in %sbug54262.php on line 4

-Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php 
on line 5
-ok
\ No newline at end of file
+Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5
+ok

Modified: php/php-src/trunk/Zend/tests/bug54262.phpt
===
--- php/php-src/trunk/Zend/tests/bug54262.phpt  2011-08-31 10:22:18 UTC (rev 
315872)
+++ php/php-src/trunk/Zend/tests/bug54262.phpt  2011-08-31 10:30:39 UTC (rev 
315873)
@@ -11,7 +11,7 @@
 --EXPECTF--
 bool(true)

-Warning: Attempt to modify property of non-object in 
%s/Zend/tests/bug54262.php on line 4
+Warning: Attempt to modify property of non-object in %sbug54262.php on line 4

-Warning: Cannot use a scalar value as an array in %s/Zend/tests/bug54262.php 
on line 5
-ok
\ No newline at end of file
+Warning: Cannot use a scalar value as an array in %sbug54262.php on line 5
+ok

-- 
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/tests/debug_backtrace_limit.phpt trunk/Zend/tests/debug_backtrace_limit.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:43:39 +

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

Log:
- use only the test name

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt
U   php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt

Modified: php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt  
2011-08-31 10:34:19 UTC (rev 315874)
+++ php/php-src/branches/PHP_5_4/Zend/tests/debug_backtrace_limit.phpt  
2011-08-31 10:43:39 UTC (rev 315875)
@@ -24,7 +24,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -38,7 +38,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -49,7 +49,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -63,7 +63,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -74,7 +74,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -85,7 +85,7 @@

 [2] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 17
 [function] = a
 [args] = Array
@@ -99,7 +99,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -110,7 +110,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -121,7 +121,7 @@

 [2] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 17
 [function] = a
 [args] = Array

Modified: php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt
===
--- php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 
10:34:19 UTC (rev 315874)
+++ php/php-src/trunk/Zend/tests/debug_backtrace_limit.phpt 2011-08-31 
10:43:39 UTC (rev 315875)
@@ -24,7 +24,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -38,7 +38,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -49,7 +49,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -63,7 +63,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -74,7 +74,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -85,7 +85,7 @@

 [2] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 17
 [function] = a
 [args] = Array
@@ -99,7 +99,7 @@
 (
 [0] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 7
 [function] = c
 [args] = Array
@@ -110,7 +110,7 @@

 [1] = Array
 (
-[file] = %s/debug_backtrace_limit.php
+[file] = %sdebug_backtrace_limit.php
 [line] = 3
 [function] = b
 [args] = Array
@@ -121,7 +121,7 @@

 [2] = Array
 (
-

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt trunk/Zend/tests/debug_print_backtrace_limit.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 10:46:20 +

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

Log:
- use only the test name

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt
U   php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt

Modified: 
php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt
2011-08-31 10:43:39 UTC (rev 315875)
+++ php/php-src/branches/PHP_5_4/Zend/tests/debug_print_backtrace_limit.phpt
2011-08-31 10:46:20 UTC (rev 315876)
@@ -20,12 +20,12 @@
 a();
 ?
 --EXPECTF--
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#2  a() called at [%s/debug_print_backtrace_limit.php:17]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#2  a() called at [%s/debug_print_backtrace_limit.php:17]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#2  a() called at [%sdebug_print_backtrace_limit.php:17]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#2  a() called at [%sdebug_print_backtrace_limit.php:17]

Modified: php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt
===
--- php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt   
2011-08-31 10:43:39 UTC (rev 315875)
+++ php/php-src/trunk/Zend/tests/debug_print_backtrace_limit.phpt   
2011-08-31 10:46:20 UTC (rev 315876)
@@ -20,12 +20,12 @@
 a();
 ?
 --EXPECTF--
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#2  a() called at [%s/debug_print_backtrace_limit.php:17]
-#0  c() called at [%s/debug_print_backtrace_limit.php:7]
-#1  b() called at [%s/debug_print_backtrace_limit.php:3]
-#2  a() called at [%s/debug_print_backtrace_limit.php:17]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#2  a() called at [%sdebug_print_backtrace_limit.php:17]
+#0  c() called at [%sdebug_print_backtrace_limit.php:7]
+#1  b() called at [%sdebug_print_backtrace_limit.php:3]
+#2  a() called at [%sdebug_print_backtrace_limit.php:17]

-- 
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/NEWS branches/PHP_5_3/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysql/php_mysql.c trunk/ext/mysql/php_mysql.c

[Johannes Schlüter]

johannes Wed, 31 Aug 2011 11:11:08 +

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

Log:
- Fix Bug #0 mysql.trace_mode miscounts result sets,
  fixes ext/mysql/tests/mysql_deprecated_api.phpt

Bug: https://bugs.php.net/0 (Open) mysql.trace_mode miscounts result sets
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
U   php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U   php/php-src/trunk/ext/mysql/php_mysql.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2011-08-31 10:46:20 UTC (rev 315876)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-08-31 11:11:08 UTC (rev 315877)
@@ -12,6 +12,9 @@
   . Fixed bug #48476 (cloning extended DateTime class without calling
 parent::__constr crashed PHP). (Hannes)

+- MySQL:
+  . Fixed bug #0 (mysql.trace_mode miscounts result sets). (Johannes)
+
 - Phar:
   . Fixed bug#52013 (Unable to decompress files in a compressed phar). (Hannes)
   . Fixed bug#53872 (internal corruption of phar). (Hannes)

Modified: php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-08-31 10:46:20 UTC 
(rev 315876)
+++ php/php-src/branches/PHP_5_3/ext/mysql/php_mysql.c  2011-08-31 11:11:08 UTC 
(rev 315877)
@@ -1588,6 +1588,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1625,6 +1626,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1662,6 +1664,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1694,6 +1697,7 @@
RETURN_FALSE;
}

+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-08-31 10:46:20 UTC 
(rev 315876)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c  2011-08-31 11:11:08 UTC 
(rev 315877)
@@ -1590,6 +1590,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1627,6 +1628,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1664,6 +1666,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1696,6 +1699,7 @@
RETURN_FALSE;
}

+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */

Modified: php/php-src/trunk/ext/mysql/php_mysql.c
===
--- php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-31 10:46:20 UTC (rev 
315876)
+++ php/php-src/trunk/ext/mysql/php_mysql.c 2011-08-31 11:11:08 UTC (rev 
315877)
@@ -1590,6 +1590,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1627,6 +1628,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ -1664,6 +1666,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to save 
MySQL query result);
RETURN_FALSE;
}
+   MySG(result_allocated)++;
ZEND_REGISTER_RESOURCE(return_value, mysql_result, le_result);
 }
 /* }}} */
@@ 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/function_arguments_001.phpt trunk/Zend/tests/function_arguments_001.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 11:16:25 +

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

Log:
- parser version independent

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
U   php/php-src/trunk/Zend/tests/function_arguments_001.phpt

Modified: php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt 
2011-08-31 11:11:08 UTC (rev 315877)
+++ php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_001.phpt 
2011-08-31 11:16:25 UTC (rev 315878)
@@ -5,5 +5,5 @@
 function foo($arg1 string) {}
 ?
 --EXPECTF--
-Parse error: syntax error, unexpected 'string' (T_STRING), expecting ')' in 
%sfunction_arguments_001.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d


Modified: php/php-src/trunk/Zend/tests/function_arguments_001.phpt
===
--- php/php-src/trunk/Zend/tests/function_arguments_001.phpt2011-08-31 
11:11:08 UTC (rev 315877)
+++ php/php-src/trunk/Zend/tests/function_arguments_001.phpt2011-08-31 
11:16:25 UTC (rev 315878)
@@ -5,5 +5,5 @@
 function foo($arg1 string) {}
 ?
 --EXPECTF--
-Parse error: syntax error, unexpected 'string' (T_STRING), expecting ')' in 
%sfunction_arguments_001.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_001.php on line %d


-- 
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/tests/function_arguments_002.phpt trunk/Zend/tests/function_arguments_002.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 11:18:13 +

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

Log:
- parser version independent

Changed paths:
U   php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
U   php/php-src/trunk/Zend/tests/function_arguments_002.phpt

Modified: php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt 
2011-08-31 11:16:25 UTC (rev 315878)
+++ php/php-src/branches/PHP_5_4/Zend/tests/function_arguments_002.phpt 
2011-08-31 11:18:13 UTC (rev 315879)
@@ -5,5 +5,5 @@
 function foo($arg1/) {}
 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '/', expecting ')' in 
%sfunction_arguments_002.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d


Modified: php/php-src/trunk/Zend/tests/function_arguments_002.phpt
===
--- php/php-src/trunk/Zend/tests/function_arguments_002.phpt2011-08-31 
11:16:25 UTC (rev 315878)
+++ php/php-src/trunk/Zend/tests/function_arguments_002.phpt2011-08-31 
11:18:13 UTC (rev 315879)
@@ -5,5 +5,5 @@
 function foo($arg1/) {}
 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '/', expecting ')' in 
%sfunction_arguments_002.php on line %d
+Parse error: %s error, %s)%s in %sfunction_arguments_002.php on line %d


-- 
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/Zend/tests/heredoc_017.phpt branches/PHP_5_4/Zend/tests/heredoc_017.phpt trunk/Zend/tests/heredoc_017.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 11:25:09 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/heredoc_017.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/heredoc_017.phpt
_U  php/php-src/trunk/Zend/tests/heredoc_017.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/heredoc_017.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/heredoc_017.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/heredoc_017.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/Zend/tests/heredoc_018.phpt PHP_5_4/Zend/tests/heredoc_018.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 11:26:27 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/heredoc_018.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/heredoc_018.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/heredoc_018.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/heredoc_018.phpt
___
Modified: svn:eol-style
   - native
   + LF

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

[PHP-CVS] svn: /php/php-src/trunk/Zend/tests/ heredoc_018.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 11:27:36 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/trunk/Zend/tests/heredoc_018.phpt


Property changes on: php/php-src/trunk/Zend/tests/heredoc_018.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/ext/simplexml/simplexml.c branches/PHP_5_4/ext/simplexml/tests/008.phpt trunk/ext/simplexml/simplexml.c trunk/ext/simplexml/tests/008.phpt

[Christian Stocker]

chregu   Wed, 31 Aug 2011 11:44:22 +

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

Log:
simplexml-query returns empty array if no nodes were found
and false if libxml thinks the xpath-expression was invalid.
Behaves now the same like DomXPath and fixes Bug #48601
Adjusted a test to reflect that change

Bug: https://bugs.php.net/48601 (Re-Opened) xpath() returns FALSE for 
legitimate query
  
Changed paths:
U   php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
U   php/php-src/branches/PHP_5_4/ext/simplexml/tests/008.phpt
U   php/php-src/trunk/ext/simplexml/simplexml.c
U   php/php-src/trunk/ext/simplexml/tests/008.phpt

Modified: php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c
===
--- php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c  2011-08-31 
11:27:36 UTC (rev 315882)
+++ php/php-src/branches/PHP_5_4/ext/simplexml/simplexml.c  2011-08-31 
11:44:22 UTC (rev 315883)
@@ -1294,8 +1294,9 @@

result = retval-nodesetval;

+   array_init(return_value);
+
if (result != NULL) {
-   array_init(return_value);
for (i = 0; i  result-nodeNr; ++i) {
nodeptr = result-nodeTab[i];
if (nodeptr-type == XML_TEXT_NODE || nodeptr-type == 
XML_ELEMENT_NODE || nodeptr-type == XML_ATTRIBUTE_NODE) {
@@ -1316,8 +1317,6 @@
add_next_index_zval(return_value, value);
}
}
-   } else {
-   RETVAL_FALSE;
}

xmlXPathFreeObject(retval);

Modified: php/php-src/branches/PHP_5_4/ext/simplexml/tests/008.phpt
===
--- php/php-src/branches/PHP_5_4/ext/simplexml/tests/008.phpt   2011-08-31 
11:27:36 UTC (rev 315882)
+++ php/php-src/branches/PHP_5_4/ext/simplexml/tests/008.phpt   2011-08-31 
11:44:22 UTC (rev 315883)
@@ -25,7 +25,10 @@
 $sxe = simplexml_load_string($xml);

 var_dump($sxe-xpath(elem1/elem2/elem3/elem4));
+//valid expression
 var_dump($sxe-xpath(***));
+//invalid expression
+var_dump($sxe-xpath(**));
 ?
 --EXPECTF--
 array(1) {
@@ -36,4 +39,10 @@
 }
   }
 }
+array(0) {
+}
+
+Warning: SimpleXMLElement::xpath(): Invalid expression in %s on line %d
+
+Warning: SimpleXMLElement::xpath(): xmlXPathEval: evaluation failed in %s on 
line %d
 bool(false)

Modified: php/php-src/trunk/ext/simplexml/simplexml.c
===
--- php/php-src/trunk/ext/simplexml/simplexml.c 2011-08-31 11:27:36 UTC (rev 
315882)
+++ php/php-src/trunk/ext/simplexml/simplexml.c 2011-08-31 11:44:22 UTC (rev 
315883)
@@ -1294,8 +1294,9 @@

result = retval-nodesetval;

+   array_init(return_value);
+
if (result != NULL) {
-   array_init(return_value);
for (i = 0; i  result-nodeNr; ++i) {
nodeptr = result-nodeTab[i];
if (nodeptr-type == XML_TEXT_NODE || nodeptr-type == 
XML_ELEMENT_NODE || nodeptr-type == XML_ATTRIBUTE_NODE) {
@@ -1316,8 +1317,6 @@
add_next_index_zval(return_value, value);
}
}
-   } else {
-   RETVAL_FALSE;
}

xmlXPathFreeObject(retval);

Modified: php/php-src/trunk/ext/simplexml/tests/008.phpt
===
--- php/php-src/trunk/ext/simplexml/tests/008.phpt  2011-08-31 11:27:36 UTC 
(rev 315882)
+++ php/php-src/trunk/ext/simplexml/tests/008.phpt  2011-08-31 11:44:22 UTC 
(rev 315883)
@@ -25,7 +25,10 @@
 $sxe = simplexml_load_string($xml);

 var_dump($sxe-xpath(elem1/elem2/elem3/elem4));
+//valid expression
 var_dump($sxe-xpath(***));
+//invalid expression
+var_dump($sxe-xpath(**));
 ?
 --EXPECTF--
 array(1) {
@@ -36,4 +39,10 @@
 }
   }
 }
+array(0) {
+}
+
+Warning: SimpleXMLElement::xpath(): Invalid expression in %s on line %d
+
+Warning: SimpleXMLElement::xpath(): xmlXPathEval: evaluation failed in %s on 
line %d
 bool(false)

-- 
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/Zend/tests/nowdoc_013.phpt trunk/Zend/tests/nowdoc_013.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 12:26:55 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_013.phpt
_U  php/php-src/trunk/Zend/tests/nowdoc_013.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_013.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/nowdoc_013.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/tests/ nowdoc_013.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 12:27:11 +

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

Log:
- force LF eol style as this test depends on it (size)

Changed paths:
_U  php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_013.phpt


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_013.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/mysqli/tests/061.phpt branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt branches/PHP_5_4/ext/mysqli/tests/061.phpt branches/PHP_5_4/ext/mysqli/tests/bug

[Ulf Wendel]

uw   Wed, 31 Aug 2011 12:58:25 +

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

Log:
Check if server supports LOAD DATA LOCAL INFILE to catch [1148] The used 
command is not allowed with this MySQL version during SKIPIF

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt
U   php/php-src/trunk/ext/mysqli/tests/061.phpt
U   php/php-src/trunk/ext/mysqli/tests/bug49442.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt	2011-08-31 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/061.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -6,6 +6,21 @@
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die(skip - function not available.);
+
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+  die(sprintf(skip Can't connect [%d] %s, mysqli_connect_errno(), mysqli_connect_error()));
+
+if (!mysqli_query($link,DROP TABLE IF EXISTS t_061))
+	die(sprintf(skip Cannot drop table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+
+if (!mysqli_query($link,CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10
+	die(sprintf(skip Cannot create table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+
+if (!mysqli_query($link, sprintf(LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS TERMINATED BY ';', mysqli_real_escape_string($link, $filename
+	if (1148 == mysqli_errno($link))
+		die(sprintf(skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s, mysqli_errno($link), mysqli_error($link)));
+
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/bug49442.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -4,6 +4,31 @@
 ?php
 require_once('skipif.inc');
 require_once('skipifconnectfailure.inc');
+
+$link = mysqli_init();
+if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
+	die(sprintf(skip Connect failed, [%d] %s\n, mysqli_connect_errno(), mysqli_connect_error()));
+}
+
+if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
+	die(sprintf(skip Failed to drop old test table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+}
+
+if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id)) ENGINE=' . $engine)) {
+	die(sprintf(skip Failed to create test table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+}
+
+require_once(local_infile_tools.inc);
+$file = create_standard_csv(4);
+
+if (!@mysqli_query($link, sprintf(LOAD DATA LOCAL INFILE '%s'
+		INTO TABLE test
+		FIELDS TERMINATED BY ';' OPTIONALLY ENCLOSED BY '\''
+		LINES TERMINATED BY '\n',
+		mysqli_real_escape_string($link, $file {
+		if (1148 == mysqli_errno($link))
+			die(sprintf(skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s\n,  mysqli_errno($link), mysqli_error($link)));
+}
 ?
 --INI--
 mysqli.allow_local_infile=1

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt	2011-08-31 12:27:11 UTC (rev 315887)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/061.phpt	2011-08-31 12:58:25 UTC (rev 315888)
@@ -6,6 +6,21 @@
 require_once('skipifconnectfailure.inc');
 if (!function_exists('mysqli_set_local_infile_handler'))
 	die(skip - function not available.);
+
+$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+if (!$link)
+  die(sprintf(skip Can't connect [%d] %s, mysqli_connect_errno(), mysqli_connect_error()));
+
+if (!mysqli_query($link,DROP TABLE IF EXISTS t_061))
+	die(sprintf(skip Cannot drop table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+
+if (!mysqli_query($link,CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10
+	die(sprintf(skip Cannot create table: [%d] %s\n, mysqli_errno($link), mysqli_error($link)));
+
+if (!mysqli_query($link, sprintf(LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS TERMINATED BY ';', mysqli_real_escape_string($link, $filename
+	if (1148 == mysqli_errno($link))
+		die(sprintf(skip Cannot test LOAD DATA LOCAL INFILE, [%d] %s, mysqli_errno($link), mysqli_error($link)));
+
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/bug49442.phpt	

[PHP-CVS] svn: /php/php-src/trunk/ext/mbstring/libmbfl/ filters/mbfilter_iso2022jp_mobile.c filters/mbfilter_sjis_mobile.c filters/mbfilter_utf8_mobile.c filters/mbfilter_utf8_mobile.h mbfl/mbfl_conve

[Rui Hirokawa]

hirokawa Wed, 31 Aug 2011 13:18:44 +

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

Log:
added alias for *-mobile encodings.

Changed paths:
U   
php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
U   php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
U   php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
U   php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h
U   php/php-src/trunk/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
U   php/php-src/trunk/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
U   php/php-src/trunk/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
U   php/php-src/trunk/ext/mbstring/libmbfl/mbfl/mbfl_ident.c

Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c	2011-08-31 13:17:44 UTC (rev 315889)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
@@ -42,12 +42,14 @@
 extern int mbfl_filt_conv_any_jis_flush(mbfl_convert_filter *filter);
 extern int mbfl_filt_ident_2022jpms(int c, mbfl_identify_filter *filter);

+static const char *mbfl_encoding_2022jp_kddi_aliases[] = {ISO-2022-JP-KDDI, NULL};
+
 const mbfl_encoding mbfl_encoding_2022jp_kddi = {
 	mbfl_no_encoding_2022jp_kddi,
 	ISO-2022-JP-MOBILE#KDDI,
 	ISO-2022-JP,
+	mbfl_encoding_2022jp_kddi_aliases,
 	NULL,
-	NULL,
 	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE
 };


Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c	2011-08-31 13:17:44 UTC (rev 315889)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
@@ -44,11 +44,15 @@
 extern int mbfl_filt_ident_sjis(int c, mbfl_identify_filter *filter);
 extern const unsigned char mblen_table_sjis[];

+static const char *mbfl_encoding_sjis_docomo_aliases[] = {SJIS-DOCOMO, shift_jis-imode, x-sjis-emoji-docomo, NULL};
+static const char *mbfl_encoding_sjis_kddi_aliases[] = {SJIS-KDDI, shift_jis-kddi, x-sjis-emoji-kddi, NULL};
+static const char *mbfl_encoding_sjis_sb_aliases[] = {SJIS-SOFTBANK, shift_jis-softbank, x-sjis-emoji-softbank, NULL};
+
 const mbfl_encoding mbfl_encoding_sjis_docomo = {
  	mbfl_no_encoding_sjis_docomo,
  	SJIS-Mobile#DOCOMO,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_docomo_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };
@@ -57,7 +61,7 @@
  	mbfl_no_encoding_sjis_kddi,
  	SJIS-Mobile#KDDI,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_kddi_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };
@@ -66,7 +70,7 @@
  	mbfl_no_encoding_sjis_sb,
  	SJIS-Mobile#SOFTBANK,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_sb_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };

Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c	2011-08-31 13:17:44 UTC (rev 315889)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
@@ -40,10 +40,10 @@

 extern const unsigned char mblen_table_utf8[];

-static const char *mbfl_encoding_utf8_docomo_aliases[] = {utf8-mobile#docomo, NULL};
-static const char *mbfl_encoding_utf8_kddi_aliases[] = {utf8-mobile#kddi, NULL};
-static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {utf8-mobile#kddi-b, NULL};
-static const char *mbfl_encoding_utf8_sb_aliases[] = {utf8-mobile#softbank, NULL};
+static const char *mbfl_encoding_utf8_docomo_aliases[] = {UTF-8-DOCOMO, UTF8-DOCOMO, NULL};
+static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {UTF-8-KDDI, UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {UTF-8-Mobile#KDDI, UTF-8-KDDI, UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_sb_aliases[] = {UTF-8-SOFTBANK, UTF8-SOFTBANK, NULL};

 const mbfl_encoding mbfl_encoding_utf8_docomo = {
 	mbfl_no_encoding_utf8_docomo,
@@ -54,11 +54,11 @@
 	MBFL_ENCTYPE_MBCS
 };

-const mbfl_encoding mbfl_encoding_utf8_kddi = {
-	mbfl_no_encoding_utf8_kddi,
-	UTF-8-Mobile#KDDI,
+const mbfl_encoding mbfl_encoding_utf8_kddi_a = {
+	mbfl_no_encoding_utf8_kddi_a,
+	UTF-8-Mobile#KDDI-A,
 	UTF-8,
-	(const char *(*)[])mbfl_encoding_utf8_kddi_aliases,
+	(const char *(*)[])mbfl_encoding_utf8_kddi_a_aliases,
 	mblen_table_utf8,
 	MBFL_ENCTYPE_MBCS
 };
@@ -88,8 +88,8 @@
 	mbfl_filt_ident_utf8
 };

-const struct mbfl_identify_vtbl vtbl_identify_utf8_kddi = {
-	mbfl_no_encoding_utf8_kddi,
+const struct 

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/ filters/mbfilter_iso2022jp_mobile.c filters/mbfilter_sjis_mobile.c filters/mbfilter_utf8_mobile.c filters/mbfilter_utf8_mobile.h mbfl

[Rui Hirokawa]

hirokawa Wed, 31 Aug 2011 13:19:03 +

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

Log:
MFH: added alias for *-mobile encodings.

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
U   
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
U   
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
U   
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.h
U   php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfl_convert.c
U   php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfl_encoding.c
U   php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
U   php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/mbfl/mbfl_ident.c

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.c	2011-08-31 13:19:03 UTC (rev 315891)
@@ -42,12 +42,14 @@
 extern int mbfl_filt_conv_any_jis_flush(mbfl_convert_filter *filter);
 extern int mbfl_filt_ident_2022jpms(int c, mbfl_identify_filter *filter);

+static const char *mbfl_encoding_2022jp_kddi_aliases[] = {ISO-2022-JP-KDDI, NULL};
+
 const mbfl_encoding mbfl_encoding_2022jp_kddi = {
 	mbfl_no_encoding_2022jp_kddi,
 	ISO-2022-JP-MOBILE#KDDI,
 	ISO-2022-JP,
+	mbfl_encoding_2022jp_kddi_aliases,
 	NULL,
-	NULL,
 	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_SHFTCODE | MBFL_ENCTYPE_GL_UNSAFE
 };


Modified: php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.c	2011-08-31 13:19:03 UTC (rev 315891)
@@ -44,11 +44,15 @@
 extern int mbfl_filt_ident_sjis(int c, mbfl_identify_filter *filter);
 extern const unsigned char mblen_table_sjis[];

+static const char *mbfl_encoding_sjis_docomo_aliases[] = {SJIS-DOCOMO, shift_jis-imode, x-sjis-emoji-docomo, NULL};
+static const char *mbfl_encoding_sjis_kddi_aliases[] = {SJIS-KDDI, shift_jis-kddi, x-sjis-emoji-kddi, NULL};
+static const char *mbfl_encoding_sjis_sb_aliases[] = {SJIS-SOFTBANK, shift_jis-softbank, x-sjis-emoji-softbank, NULL};
+
 const mbfl_encoding mbfl_encoding_sjis_docomo = {
  	mbfl_no_encoding_sjis_docomo,
  	SJIS-Mobile#DOCOMO,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_docomo_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };
@@ -57,7 +61,7 @@
  	mbfl_no_encoding_sjis_kddi,
  	SJIS-Mobile#KDDI,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_kddi_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };
@@ -66,7 +70,7 @@
  	mbfl_no_encoding_sjis_sb,
  	SJIS-Mobile#SOFTBANK,
  	Shift_JIS,
- 	NULL,
+ 	mbfl_encoding_sjis_sb_aliases,
  	mblen_table_sjis,
  	MBFL_ENCTYPE_MBCS | MBFL_ENCTYPE_GL_UNSAFE
 };

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c	2011-08-31 13:18:44 UTC (rev 315890)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8_mobile.c	2011-08-31 13:19:03 UTC (rev 315891)
@@ -40,10 +40,10 @@

 extern const unsigned char mblen_table_utf8[];

-static const char *mbfl_encoding_utf8_docomo_aliases[] = {utf8-mobile#docomo, NULL};
-static const char *mbfl_encoding_utf8_kddi_aliases[] = {utf8-mobile#kddi, NULL};
-static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {utf8-mobile#kddi-b, NULL};
-static const char *mbfl_encoding_utf8_sb_aliases[] = {utf8-mobile#softbank, NULL};
+static const char *mbfl_encoding_utf8_docomo_aliases[] = {UTF-8-DOCOMO, UTF8-DOCOMO, NULL};
+static const char *mbfl_encoding_utf8_kddi_a_aliases[] = {UTF-8-KDDI, UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_kddi_b_aliases[] = {UTF-8-Mobile#KDDI, UTF-8-KDDI, UTF8-KDDI, NULL};
+static const char *mbfl_encoding_utf8_sb_aliases[] = {UTF-8-SOFTBANK, UTF8-SOFTBANK, NULL};

 const mbfl_encoding mbfl_encoding_utf8_docomo = {
 	mbfl_no_encoding_utf8_docomo,
@@ -54,11 +54,11 @@
 	MBFL_ENCTYPE_MBCS
 };

-const mbfl_encoding mbfl_encoding_utf8_kddi = {
-	mbfl_no_encoding_utf8_kddi,
-	UTF-8-Mobile#KDDI,
+const mbfl_encoding mbfl_encoding_utf8_kddi_a = {
+	mbfl_no_encoding_utf8_kddi_a,
+	UTF-8-Mobile#KDDI-A,
 	UTF-8,
-	(const char *(*)[])mbfl_encoding_utf8_kddi_aliases,
+	(const char *(*)[])mbfl_encoding_utf8_kddi_a_aliases,
 	

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

[Ulf Wendel]

uw   Wed, 31 Aug 2011 13:59:28 +

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

Log:
Please, whenever changing the mysqli API update the tests. Don't wait for me to 
catch up.

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

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 
2011-08-31 13:50:58 UTC (rev 315894)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 
2011-08-31 13:59:28 UTC (rev 315895)
@@ -160,6 +160,9 @@
if (defined('MYSQLI_DATA_TRUNCATED'))
$expected_constants[MYSQLI_DATA_TRUNCATED] = true;

+   if (defined('MYSQLI_SERVER_PS_OUT_PARAMS'))
+   $expected_constants[MYSQLI_SERVER_PS_OUT_PARAMS] = true;
+
if (!$IS_MYSQLND) {
/* libmysql only */


Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_constants.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_constants.phpt 
2011-08-31 13:50:58 UTC (rev 315894)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_constants.phpt 
2011-08-31 13:59:28 UTC (rev 315895)
@@ -160,6 +160,9 @@
if (defined('MYSQLI_DATA_TRUNCATED'))
$expected_constants[MYSQLI_DATA_TRUNCATED] = true;

+   if (defined('MYSQLI_SERVER_PS_OUT_PARAMS'))
+   $expected_constants[MYSQLI_SERVER_PS_OUT_PARAMS] = true;
+
if (!$IS_MYSQLND) {
/* libmysql only */


Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt
===
--- php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt2011-08-31 
13:50:58 UTC (rev 315894)
+++ php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt2011-08-31 
13:59:28 UTC (rev 315895)
@@ -160,6 +160,9 @@
if (defined('MYSQLI_DATA_TRUNCATED'))
$expected_constants[MYSQLI_DATA_TRUNCATED] = true;

+   if (defined('MYSQLI_SERVER_PS_OUT_PARAMS'))
+   $expected_constants[MYSQLI_SERVER_PS_OUT_PARAMS] = true;
+
if (!$IS_MYSQLND) {
/* libmysql only */


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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Hannes Magnusson]

bjoriWed, 31 Aug 2011 15:08:18 +

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

Log:
catalan karma for Oriol de la Torre

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-08-31 14:46:47 UTC (rev 315899)
+++ SVNROOT/global_avail2011-08-31 15:08:18 UTC (rev 315900)
@@ -73,7 +73,7 @@

 # Some people get only access to specific languages for phpdoc
 avail|diab,daif,salehcoder|phpdoc/ar
-avail|noihex,mfalgas,ereza,ebi,ait,jabro,eduardcapell,oriolm,yagooar,jeprubio,marctm|phpdoc/ca
+avail|noihex,mfalgas,ereza,ebi,ait,jabro,eduardcapell,oriolm,yagooar,jeprubio,marctm,uri|phpdoc/ca
 avail|mkoula|phpdoc/cs
 avail|penguin,tkxs|phpdoc/da
 avail|kore,thorstenr,lapistano,raphaelm|phpdoc/de

-- 
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/pdo_mysql/tests/pdo_mysql___construct.phpt branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt trunk/ext/pdo_mysql/tests/pdo_mysql___const

[Johannes Schlüter]

johannes Wed, 31 Aug 2011 15:25:18 +

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

Log:
- Be less restrictive on the SQL state, some server versions might fool us

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

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 15:08:18 UTC (rev 315900)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 15:25:18 UTC (rev 315901)
@@ -294,7 +294,7 @@
 [005] invalid data source name, [n/a] n/a
 [006] invalid data source name, [n/a] n/a
 [007] could not find driver, [n/a] n/a
-[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
-[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[009] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[010] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [017] DSN=%s, SQLSTATE[%s] [%d] %s
 [033] DSN = mysql:%s, character sets has not been set, 
@@character_set_connection reports 'latin1', expecting 'latin2'done!

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 15:08:18 UTC (rev 315900)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct.phpt 
2011-08-31 15:25:18 UTC (rev 315901)
@@ -294,7 +294,7 @@
 [005] invalid data source name, [n/a] n/a
 [006] invalid data source name, [n/a] n/a
 [007] could not find driver, [n/a] n/a
-[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
-[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[009] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[010] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [017] DSN=%s, SQLSTATE[%s] [%d] %s
 done!

Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2011-08-31 15:08:18 UTC (rev 315900)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct.phpt
2011-08-31 15:25:18 UTC (rev 315901)
@@ -294,7 +294,7 @@
 [005] invalid data source name, [n/a] n/a
 [006] invalid data source name, [n/a] n/a
 [007] could not find driver, [n/a] n/a
-[009] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
-[010] SQLSTATE[28000] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[009] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
+[010] SQLSTATE[%s] [1045] Access denied for user 'dont%s'@'%s' (using 
password: YES), [n/a] n/a
 [017] DSN=%s, SQLSTATE[%s] [%d] %s
 done!

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

Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt trunk/ext/standard/tests/strings/htmlentities15.phpt

[Gustavo Lopes]

On Wed, 31 Aug 2011 07:39:43 +0100, Stas Malyshev smalys...@sugarcrm.com  
wrote:



Hi!

On 8/30/11 11:32 PM, Gustavo André dos Santos Lopes wrote:

cataphract   Wed, 31 Aug 2011 06:32:05 +

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

Log:
- Fixed test htmlentities15.phpt.

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


Modified:  
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt

===
---  
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt	2011-08-31  
06:26:39 UTC (rev 315850)
+++  
php/php-src/branches/PHP_5_4/ext/standard/tests/strings/htmlentities15.phpt	2011-08-31  
06:32:05 UTC (rev 315851)

@@ -11,6 +11,9 @@
die(skip setlocale() failed\n);
  }
  ?
+--COMMENT--
+As of PHP 5.4, htmlentities() no longer makes replacements with  
numerical

+entities. Hence, for this input there's no substitution.
  --FILE--
  ?php
  setlocale(LC_CTYPE, ru_RU.koi8r, ru_RU.KOI8-R);
@@ -19,4 +22,4 @@
  ?
  --EXPECT--
  string(9) �
-string(63)  
#1088;#1086;#1089;#1082;#1086;#1096;#1085;#1099;#1081;

+string(9) �


Could you explain what this test is doing and why? What '' encoding  
means (docs say nothing of it), why we set locale to KOI8-R?


The '' encoding activates the old behavior of detecting the encoding. This  
detection from the locale and other sources dates to before htmlentitites  
had an encoding parameter.


It's been working this way since 2001:  
http://lxr.php.net/xref/PHP_TRUNK/ext/standard/html.c?a=truer=50559#229
In the revision before, not specifying the encoding would have the same  
effect as specifying '', i.e. autodetection.


But you're right, it should be documented.

(CC to internals because you also sent an e-mail about this test there)

--
Gustavo Lopes

--
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/Zend/tests/nowdoc_014.phpt branches/PHP_5_4/Zend/tests/nowdoc_014.phpt trunk/Zend/tests/nowdoc_014.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 15:42:42 +

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

Log:
- force LF eol style as this test depends on it

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_014.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_014.phpt
_U  php/php-src/trunk/Zend/tests/nowdoc_014.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_014.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_014.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/nowdoc_014.phpt
___
Modified: svn:eol-style
   - native
   + LF

-- 
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/Zend/tests/nowdoc_015.phpt branches/PHP_5_4/Zend/tests/nowdoc_015.phpt trunk/Zend/tests/nowdoc_015.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 15:44:01 +

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

Log:
- force LF eol style as this test depends on it

Changed paths:
_U  php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_015.phpt
_U  php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_015.phpt
_U  php/php-src/trunk/Zend/tests/nowdoc_015.phpt


Property changes on: php/php-src/branches/PHP_5_3/Zend/tests/nowdoc_015.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/branches/PHP_5_4/Zend/tests/nowdoc_015.phpt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/Zend/tests/nowdoc_015.phpt
___
Modified: svn:eol-style
   - native
   + LF

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Hannes Magnusson]

bjoriWed, 31 Aug 2011 17:13:32 +

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

Log:
doc karma for Anatoliy Belsky

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-08-31 16:19:44 UTC (rev 315906)
+++ SVNROOT/global_avail2011-08-31 17:13:32 UTC (rev 315907)
@@ -299,7 +299,7 @@
 avail|guilhermeblanco|phpweb
 avail|iodbc|php/php-src/*/ext/odbc
 avail|ross|phpdoc,gd
-avail|ab|pecl/ktaglib,pecl/gender,pecl/varnish
+avail|ab|pecl/ktaglib,pecl/gender,pecl/varnish,phpdoc
 avail|mabouzou|pecl/sqlanywhere
 avail|jawed,datibbaw|pecl/oauth
 avail|sean|pecl/parsekit
@@ -345,7 +345,6 @@
 avail|knut|php/php-src/*/tests
 avail|laruence|pecl/yaf,phpdoc
 avail|whereswardy|pecl/handlersocket,phpdoc
-avail|ab|pecl/varnish

 # Objective-C bridge
 avail|wez,jan|php/php-objc

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Hannes Magnusson]

bjoriWed, 31 Aug 2011 17:44:16 +

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

Log:
tests karma for Tjerk Anne Meesters

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-08-31 17:13:32 UTC (rev 315907)
+++ SVNROOT/global_avail2011-08-31 17:44:16 UTC (rev 315908)
@@ -244,7 +244,7 @@
 avail|val|pecl/bcompiler,phpdoc
 avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference
 avail|ksadlocha|pecl/simplesql
-avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee,tyrael,shein,dtajchreber,yaauie|php/php-src/*/tests,phpdoc
+avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee,tyrael,shein,dtajchreber,yaauie,datibbaw|php/php-src/*/tests,phpdoc
 avail|blindman|pecl/colorer
 avail|mike|pecl/http
 avail|gabe|pecl/intercept

-- 
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/mysqlnd/mysqlnd_net.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h branches/PHP_5_4/ext/mysqlnd/mysqlnd_net.c branches/PHP_5_4/ext/mysqlnd/mysqlnd_s

[Andrey Hristov]

andrey   Wed, 31 Aug 2011 18:18:23 +

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

Log:
Fix valgrind error (sending of initialized bytes over the network).
When the compression was successful the compressed data + uninitialized data
at the end was sent to the server, because the length of the compressed payload
wasn't correctly calculated (actually the length of the uncompressed payload as 
assumed).
However, the uncompress() function has internally the length of the real 
payload and skips
the binary trash at the end - thus no data damage occurs!

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_net.c
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_structs.h
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd_structs.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c	2011-08-31 18:13:04 UTC (rev 315910)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c	2011-08-31 18:18:23 UTC (rev 315911)
@@ -265,7 +265,7 @@
 			STORE_HEADER_SIZE(safe_storage, uncompressed_payload);
 			int3store(uncompressed_payload, to_be_sent);
 			int1store(uncompressed_payload + 3, net-packet_no);
-			if (PASS == net-m.encode((compress_buf + COMPRESSED_HEADER_SIZE + MYSQLND_HEADER_SIZE), tmp_complen,
+			if (PASS == net-m.encode((compress_buf + COMPRESSED_HEADER_SIZE + MYSQLND_HEADER_SIZE), tmp_complen,
 	   uncompressed_payload, to_be_sent + MYSQLND_HEADER_SIZE TSRMLS_CC))
 			{
 int3store(compress_buf + MYSQLND_HEADER_SIZE, to_be_sent + MYSQLND_HEADER_SIZE);
@@ -491,20 +491,22 @@

 /* {{{ mysqlnd_net::encode */
 static enum_func_status
-MYSQLND_METHOD(mysqlnd_net, encode)(zend_uchar * compress_buffer, size_t compress_buffer_len,
+MYSQLND_METHOD(mysqlnd_net, encode)(zend_uchar * compress_buffer, size_t * compress_buffer_len,
 	const zend_uchar * const uncompressed_data, size_t uncompressed_data_len TSRMLS_DC)
 {
 #ifdef MYSQLND_COMPRESSION_ENABLED
 	int error;
-	uLongf tmp_complen = compress_buffer_len;
+	uLongf tmp_complen = *compress_buffer_len;
 	DBG_ENTER(mysqlnd_net::encode);
 	error = compress(compress_buffer, tmp_complen, uncompressed_data, uncompressed_data_len);

 	if (error != Z_OK) {
 		DBG_INF_FMT(compression NOT successful. error=%d Z_OK=%d Z_BUF_ERROR=%d Z_MEM_ERROR=%d, error, Z_OK, Z_BUF_ERROR, Z_MEM_ERROR);
 	} else {
+		*compress_buffer_len = tmp_complen;
 		DBG_INF_FMT(compression successful. compressed size=%lu, tmp_complen);
 	}
+
 	DBG_RETURN(error == Z_OK? PASS:FAIL);
 #else
 	DBG_ENTER(mysqlnd_net::encode);

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h	2011-08-31 18:13:04 UTC (rev 315910)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_structs.h	2011-08-31 18:18:23 UTC (rev 315911)
@@ -258,7 +258,7 @@
 typedef enum_func_status	(*func_mysqlnd_net__network_read)(MYSQLND * conn, zend_uchar * buffer, size_t count TSRMLS_DC);
 typedef size_t(*func_mysqlnd_net__network_write)(MYSQLND * const conn, const zend_uchar * const buf, size_t count TSRMLS_DC);
 typedef enum_func_status	(*func_mysqlnd_net__decode)(zend_uchar * uncompressed_data, size_t uncompressed_data_len, const zend_uchar * const compressed_data, size_t compressed_data_len TSRMLS_DC);
-typedef enum_func_status	(*func_mysqlnd_net__encode)(zend_uchar * compress_buffer, size_t compress_buffer_len, const zend_uchar * const uncompressed_data, size_t uncompressed_data_len TSRMLS_DC);
+typedef enum_func_status	(*func_mysqlnd_net__encode)(zend_uchar * compress_buffer, size_t * compress_buffer_len, const zend_uchar * const uncompressed_data, size_t uncompressed_data_len TSRMLS_DC);
 typedef size_t(*func_mysqlnd_net__consume_uneaten_data)(MYSQLND_NET * const net, enum php_mysqlnd_server_command cmd TSRMLS_DC);
 typedef void(*func_mysqlnd_net__free_contents)(MYSQLND_NET * net TSRMLS_DC);
 typedef enum_func_status	(*func_mysqlnd_net__enable_ssl)(MYSQLND_NET * const net TSRMLS_DC);

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_net.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_net.c	2011-08-31 18:13:04 UTC (rev 315910)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd_net.c	2011-08-31 18:18:23 UTC (rev 315911)
@@ -272,7 +272,7 @@
 			STORE_HEADER_SIZE(safe_storage, uncompressed_payload);
 			int3store(uncompressed_payload, to_be_sent);
 			int1store(uncompressed_payload + 3, net-packet_no);
-			if (PASS == net-m.encode((compress_buf + COMPRESSED_HEADER_SIZE + 

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt branches/PHP_5_4/ext/standard/

[Tjerk Anne Meesters]

datibbaw Wed, 31 Aug 2011 18:26:23 +

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

Log:
Fixed expect format to ignore the textual error message from readlink().

Bug #5

Bug: https://bugs.php.net/5 (Assigned) readlink() behaviour changed
  
Changed paths:
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt
U   
php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_variation1.phpt
U   
php/php-src/trunk/ext/standard/tests/file/readlink_realpath_variation3.phpt
U   php/php-src/trunk/ext/standard/tests/file/readlink_variation1.phpt

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -46,32 +46,32 @@
 *** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***
 -- Iteration1 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration2 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration3 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 -- Iteration4 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 -- Iteration5 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 -- Iteration6 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 Done

Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/readlink_variation1.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -50,28 +50,28 @@
 --EXPECTF--
 *** Testing Invalid file types ***

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

 Warning: readlink() expects parameter 1 to be string, resource given in %s on line %d
 NULL

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)

 *** Done ***

Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:18:23 UTC (rev 315911)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/readlink_realpath_variation3.phpt	2011-08-31 18:26:23 UTC (rev 315912)
@@ -46,32 +46,32 @@
 *** Testing readlink() and realpath() with linkname as empty string, NULL and single space ***
 -- Iteration1 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration2 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 %s
 -- Iteration3 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 -- Iteration4 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 string(%d) %s
 -- Iteration5 --

-Warning: readlink(): No such file or directory in %s on line %d
+Warning: readlink(): %s in %s on line %d
 bool(false)
 

[PHP-CVS] svn: /php/php-src/trunk/ext/snmp/tests/ snmp-object-errno-errstr.phpt

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 19:44:39 +

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

Log:
test coverage for SNMP::ERRNO_MULTIPLE_SET_QUERIES

Changed paths:
U   php/php-src/trunk/ext/snmp/tests/snmp-object-errno-errstr.phpt

Modified: php/php-src/trunk/ext/snmp/tests/snmp-object-errno-errstr.phpt
===
--- php/php-src/trunk/ext/snmp/tests/snmp-object-errno-errstr.phpt  
2011-08-31 19:40:42 UTC (rev 315915)
+++ php/php-src/trunk/ext/snmp/tests/snmp-object-errno-errstr.phpt  
2011-08-31 19:44:39 UTC (rev 315916)
@@ -73,6 +73,30 @@
 var_dump(@$session-set($oid1, 'q', 'blah'));
 var_dump($session-getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
 var_dump($session-getError());
+
+echo SNMP::ERRNO_MULTIPLE_SET_QUERIES\n;
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oid2 = 'SNMPv2-MIB::sysLocation.0';
+$session = new SNMP(SNMP::VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session-setSecurity('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
+$session-max_oids = 1;
+$oldvalue1 = $session-get($oid1);
+$newvalue1 = $oldvalue1 . '0';
+$oldvalue2 = $session-get($oid2);
+$newvalue2 = $oldvalue2 . '0';
+$z = @$session-set(array($oid1, $oid2), array('s','s'), array($newvalue1, 
$newvalue2));
+var_dump($z);
+var_dump($session-getErrno() == SNMP::ERRNO_MULTIPLE_SET_QUERIES);
+var_dump($session-getError());
+var_dump(($session-get($oid1) === $newvalue1));
+var_dump(($session-get($oid2) === $newvalue2));
+$z = @$session-set(array($oid1, $oid2), array('s','s'), array($oldvalue1, 
$oldvalue2));
+var_dump($z);
+var_dump($session-getErrno() == SNMP::ERRNO_MULTIPLE_SET_QUERIES);
+var_dump($session-getError());
+var_dump(($session-get($oid1) === $oldvalue1));
+var_dump(($session-get($oid2) === $oldvalue2));
+var_dump($session-close());
 ?
 --EXPECTF--
 SNMP::ERRNO_NOERROR
@@ -108,4 +132,16 @@
 SET: Wrong type
 bool(false)
 bool(true)
-string(129) Could not add variable: 
OID='.iso.org.dod.internet.mgmt.mib-2.system.sysContact.0' type='q' 
value='blah': Bad variable type (q)
\ No newline at end of file
+string(129) Could not add variable: 
OID='.iso.org.dod.internet.mgmt.mib-2.system.sysContact.0' type='q' 
value='blah': Bad variable type (q)
+SNMP::ERRNO_MULTIPLE_SET_QUERIES
+bool(true)
+bool(true)
+string(74) Can not fit all OIDs for SET query into one packet, using multiple 
queries
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(74) Can not fit all OIDs for SET query into one packet, using multiple 
queries
+bool(true)
+bool(true)
+bool(true)

-- 
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/ext/snmp/tests/ snmp-object-errno-errstr.phpt

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 19:45:45 +

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

Log:
test coverage for SNMP::ERRNO_MULTIPLE_SET_QUERIES

Changed paths:
_U  php/php-src/branches/PHP_5_4/ext/snmp/tests/
U   
php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp/tests
___
Modified: svn:mergeinfo
   - 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862
   + 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862,315916

Modified: 
php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt
===
--- php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt   
2011-08-31 19:44:39 UTC (rev 315916)
+++ php/php-src/branches/PHP_5_4/ext/snmp/tests/snmp-object-errno-errstr.phpt   
2011-08-31 19:45:45 UTC (rev 315917)
@@ -73,6 +73,30 @@
 var_dump(@$session-set($oid1, 'q', 'blah'));
 var_dump($session-getErrno() == SNMP::ERRNO_OID_PARSING_ERROR);
 var_dump($session-getError());
+
+echo SNMP::ERRNO_MULTIPLE_SET_QUERIES\n;
+$oid1 = 'SNMPv2-MIB::sysContact.0';
+$oid2 = 'SNMPv2-MIB::sysLocation.0';
+$session = new SNMP(SNMP::VERSION_3, $hostname, $rwuser, $timeout, $retries);
+$session-setSecurity('authPriv', 'MD5', $auth_pass, 'AES', $priv_pass);
+$session-max_oids = 1;
+$oldvalue1 = $session-get($oid1);
+$newvalue1 = $oldvalue1 . '0';
+$oldvalue2 = $session-get($oid2);
+$newvalue2 = $oldvalue2 . '0';
+$z = @$session-set(array($oid1, $oid2), array('s','s'), array($newvalue1, 
$newvalue2));
+var_dump($z);
+var_dump($session-getErrno() == SNMP::ERRNO_MULTIPLE_SET_QUERIES);
+var_dump($session-getError());
+var_dump(($session-get($oid1) === $newvalue1));
+var_dump(($session-get($oid2) === $newvalue2));
+$z = @$session-set(array($oid1, $oid2), array('s','s'), array($oldvalue1, 
$oldvalue2));
+var_dump($z);
+var_dump($session-getErrno() == SNMP::ERRNO_MULTIPLE_SET_QUERIES);
+var_dump($session-getError());
+var_dump(($session-get($oid1) === $oldvalue1));
+var_dump(($session-get($oid2) === $oldvalue2));
+var_dump($session-close());
 ?
 --EXPECTF--
 SNMP::ERRNO_NOERROR
@@ -108,4 +132,16 @@
 SET: Wrong type
 bool(false)
 bool(true)
-string(129) Could not add variable: 
OID='.iso.org.dod.internet.mgmt.mib-2.system.sysContact.0' type='q' 
value='blah': Bad variable type (q)
\ No newline at end of file
+string(129) Could not add variable: 
OID='.iso.org.dod.internet.mgmt.mib-2.system.sysContact.0' type='q' 
value='blah': Bad variable type (q)
+SNMP::ERRNO_MULTIPLE_SET_QUERIES
+bool(true)
+bool(true)
+string(74) Can not fit all OIDs for SET query into one packet, using multiple 
queries
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(74) Can not fit all OIDs for SET query into one packet, using multiple 
queries
+bool(true)
+bool(true)
+bool(true)

-- 
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/tests/basic/bug45986.phpt branches/PHP_5_4/tests/basic/bug45986.phpt trunk/tests/basic/bug45986.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 20:07:44 +

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

Log:
- typo

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
U   php/php-src/trunk/tests/basic/bug45986.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt  2011-08-31 
20:03:20 UTC (rev 315920)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt  2011-08-31 
20:07:44 UTC (rev 315921)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #45986 (wrong error messag for a non existant file on rename)
+Bug #45986 (wrong error message for a non existant file on rename)
 --CREDITS--
 Sebastian Schürmann
 s...@php.net

Modified: php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt  2011-08-31 
20:03:20 UTC (rev 315920)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt  2011-08-31 
20:07:44 UTC (rev 315921)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #45986 (wrong error messag for a non existant file on rename)
+Bug #45986 (wrong error message for a non existant file on rename)
 --CREDITS--
 Sebastian Schürmann
 s...@php.net

Modified: php/php-src/trunk/tests/basic/bug45986.phpt
===
--- php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:03:20 UTC (rev 
315920)
+++ php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev 
315921)
@@ -1,5 +1,5 @@
 --TEST--
-Bug #45986 (wrong error messag for a non existant file on rename)
+Bug #45986 (wrong error message for a non existant file on rename)
 --CREDITS--
 Sebastian Schürmann
 s...@php.net

-- 
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/tests/basic/bug45986.phpt branches/PHP_5_4/tests/basic/bug45986.phpt trunk/tests/basic/bug45986.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 20:10:22 +

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

Log:
- error msg may vary

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
U   php/php-src/trunk/tests/basic/bug45986.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt  2011-08-31 
20:07:44 UTC (rev 315921)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug45986.phpt  2011-08-31 
20:10:22 UTC (rev 315922)
@@ -8,5 +8,5 @@
 ?php
 rename('foo', 'bar');
 ?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2

Modified: php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt  2011-08-31 
20:07:44 UTC (rev 315921)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug45986.phpt  2011-08-31 
20:10:22 UTC (rev 315922)
@@ -8,5 +8,5 @@
 ?php
 rename('foo', 'bar');
 ?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2

Modified: php/php-src/trunk/tests/basic/bug45986.phpt
===
--- php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:07:44 UTC (rev 
315921)
+++ php/php-src/trunk/tests/basic/bug45986.phpt 2011-08-31 20:10:22 UTC (rev 
315922)
@@ -8,5 +8,5 @@
 ?php
 rename('foo', 'bar');
 ?
---EXPECTREGEX--
-.*No such.*
+--EXPECTF--
+Warning: %s in %sbug45986.php on line 2

-- 
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/tests/basic/bug51709_1.phpt branches/PHP_5_4/tests/basic/bug51709_1.phpt trunk/tests/basic/bug51709_1.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 20:14:13 +

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

Log:
- error msg may vary (parser)

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt
U   php/php-src/trunk/tests/basic/bug51709_1.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-08-31 
20:10:22 UTC (rev 315922)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_1.phpt2011-08-31 
20:14:13 UTC (rev 315923)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected T_FOR, expecting T_STRING in 
%sbug51709_1.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d

Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-08-31 
20:10:22 UTC (rev 315922)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_1.phpt2011-08-31 
20:14:13 UTC (rev 315923)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected 'for' (T_FOR), expecting identifier 
(T_STRING) in %sbug51709_1.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d

Modified: php/php-src/trunk/tests/basic/bug51709_1.phpt
===
--- php/php-src/trunk/tests/basic/bug51709_1.phpt   2011-08-31 20:10:22 UTC 
(rev 315922)
+++ php/php-src/trunk/tests/basic/bug51709_1.phpt   2011-08-31 20:14:13 UTC 
(rev 315923)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected for (T_FOR), expecting identifier 
(T_STRING) in %sbug51709_1.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_1.php on line %d

-- 
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/snmp/ snmp.c

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 20:15:32 +

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

Log:
tune text align

Changed paths:
U   php/php-src/trunk/ext/snmp/snmp.c

Modified: php/php-src/trunk/ext/snmp/snmp.c
===
--- php/php-src/trunk/ext/snmp/snmp.c   2011-08-31 20:14:13 UTC (rev 315923)
+++ php/php-src/trunk/ext/snmp/snmp.c   2011-08-31 20:15:32 UTC (rev 315924)
@@ -112,13 +112,13 @@
} \
 }

-#define PHP_SNMP_ERRNO_NOERROR 0
-#define PHP_SNMP_ERRNO_GENERIC 1
-#define PHP_SNMP_ERRNO_TIMEOUT 2
-#define PHP_SNMP_ERRNO_ERROR_IN_REPLY  3
-#define PHP_SNMP_ERRNO_OID_NOT_INCREASING 4
-#define PHP_SNMP_ERRNO_OID_PARSING_ERROR 5
-#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES 6
+#define PHP_SNMP_ERRNO_NOERROR 0
+#define PHP_SNMP_ERRNO_GENERIC 1
+#define PHP_SNMP_ERRNO_TIMEOUT 2
+#define PHP_SNMP_ERRNO_ERROR_IN_REPLY  3
+#define PHP_SNMP_ERRNO_OID_NOT_INCREASING  4
+#define PHP_SNMP_ERRNO_OID_PARSING_ERROR   5
+#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES6

 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);

-- 
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/tests/basic/bug51709_2.phpt branches/PHP_5_4/tests/basic/bug51709_2.phpt trunk/tests/basic/bug51709_2.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 20:16:11 +

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

Log:
- error msg may vary (parser)

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt
U   php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt
U   php/php-src/trunk/tests/basic/bug51709_2.phpt

Modified: php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-08-31 
20:15:32 UTC (rev 315924)
+++ php/php-src/branches/PHP_5_3/tests/basic/bug51709_2.phpt2011-08-31 
20:16:11 UTC (rev 315925)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected T_GOTO, expecting T_STRING in 
%sbug51709_2.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d

Modified: php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt
===
--- php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-08-31 
20:15:32 UTC (rev 315924)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug51709_2.phpt2011-08-31 
20:16:11 UTC (rev 315925)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected 'goto' (T_GOTO), expecting identifier 
(T_STRING) in %sbug51709_2.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d

Modified: php/php-src/trunk/tests/basic/bug51709_2.phpt
===
--- php/php-src/trunk/tests/basic/bug51709_2.phpt   2011-08-31 20:15:32 UTC 
(rev 315924)
+++ php/php-src/trunk/tests/basic/bug51709_2.phpt   2011-08-31 20:16:11 UTC 
(rev 315925)
@@ -13,4 +13,4 @@
 ===DONE===
 ?php exit(0); ?
 --EXPECTF--
-Parse error: syntax error, unexpected goto (T_GOTO), expecting identifier 
(T_STRING) in %sbug51709_2.php on line %d
+Parse error: %s error, %s(T_STRING)%s in %sbug51709_2.php on line %d

-- 
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/ext/snmp/ snmp.c

[Boris Lytochkin]

lytboris Wed, 31 Aug 2011 20:16:56 +

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

Log:
tune text align

Changed paths:
_U  php/php-src/branches/PHP_5_4/ext/snmp/
U   php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
_U  php/php-src/branches/PHP_5_4/ext/snmp/tests/


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp
___
Modified: svn:mergeinfo
   - /php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608,315862
   + 
/php/php-src/trunk/ext/snmp:284726,311033-315236,315606,315608,315862,315924

Modified: php/php-src/branches/PHP_5_4/ext/snmp/snmp.c
===
--- php/php-src/branches/PHP_5_4/ext/snmp/snmp.c2011-08-31 20:16:11 UTC 
(rev 315925)
+++ php/php-src/branches/PHP_5_4/ext/snmp/snmp.c2011-08-31 20:16:56 UTC 
(rev 315926)
@@ -104,13 +104,13 @@
} \
 }

-#define PHP_SNMP_ERRNO_NOERROR 0
-#define PHP_SNMP_ERRNO_GENERIC 1
-#define PHP_SNMP_ERRNO_TIMEOUT 2
-#define PHP_SNMP_ERRNO_ERROR_IN_REPLY  3
-#define PHP_SNMP_ERRNO_OID_NOT_INCREASING 4
-#define PHP_SNMP_ERRNO_OID_PARSING_ERROR 5
-#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES 6
+#define PHP_SNMP_ERRNO_NOERROR 0
+#define PHP_SNMP_ERRNO_GENERIC 1
+#define PHP_SNMP_ERRNO_TIMEOUT 2
+#define PHP_SNMP_ERRNO_ERROR_IN_REPLY  3
+#define PHP_SNMP_ERRNO_OID_NOT_INCREASING  4
+#define PHP_SNMP_ERRNO_OID_PARSING_ERROR   5
+#define PHP_SNMP_ERRNO_MULTIPLE_SET_QUERIES6

 ZEND_DECLARE_MODULE_GLOBALS(snmp)
 static PHP_GINIT_FUNCTION(snmp);


Property changes on: php/php-src/branches/PHP_5_4/ext/snmp/tests
___
Modified: svn:mergeinfo
   - 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862,315916
   + 
/php/php-src/trunk/ext/snmp/tests:284726,311033-315236,315386,315606,315608,315862,315916,315924

-- 
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/ext/mysql/php_mysql.c branches/PHP_5_4/ext/mysqli/mysqli.c branches/PHP_5_4/ext/mysqlnd/mysqlnd.c branches/PHP_5_4/ext/mysqlnd/mysqlnd.h branches/PHP_5_4/

[Johannes Schlüter]

johannes Wed, 31 Aug 2011 20:30:08 +

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

Log:
- Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlnd

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
U   php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.h
U   php/php-src/branches/PHP_5_4/ext/mysqlnd/php_mysqlnd.c
U   php/php-src/branches/PHP_5_4/ext/pdo_mysql/pdo_mysql.c
U   php/php-src/trunk/ext/mysql/php_mysql.c
U   php/php-src/trunk/ext/mysqli/mysqli.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h
U   php/php-src/trunk/ext/mysqlnd/php_mysqlnd.c
U   php/php-src/trunk/ext/pdo_mysql/pdo_mysql.c

Modified: php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c
===
--- php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c	2011-08-31 20:28:08 UTC (rev 315932)
+++ php/php-src/branches/PHP_5_4/ext/mysql/php_mysql.c	2011-08-31 20:30:08 UTC (rev 315933)
@@ -529,6 +529,31 @@
 }
 /* }}} */

+#ifdef MYSQL_USE_MYSQLND
+static MYSQLND *mysql_convert_zv_to_mysqlnd(zval *zv)
+{
+	php_mysql_conn *mysql;
+
+	if (Z_TYPE_P(zv) != IS_RESOURCE) {
+		/* Might be nicer to check resource type, too, but ext/mysql is the only one using resources so emitting an error is not to bad, while usually this hook should be silent */
+		return NULL;
+	}
+
+	mysql = (php_mysql_conn *)zend_fetch_resource(zv TSRMLS_CC, -1, MySQL-Link, NULL, 2, le_link, le_plink);
+
+	if (!mysql) {
+		return NULL;
+	}
+
+	return mysql-conn;
+}
+
+static mysqlnd_api_extension_t mysqlnd_api_ext = {
+	mysql_module_entry,
+	mysql_convert_zv_to_mysqlnd
+};
+#endif
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 ZEND_MODULE_STARTUP_D(mysql)
@@ -557,6 +582,10 @@
 #endif
 #endif

+#ifdef MYSQL_USE_MYSQLND
+	mysqlnd_register_api_extension(mysqlnd_api_ext);
+#endif
+
 	return SUCCESS;
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c	2011-08-31 20:28:08 UTC (rev 315932)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/mysqli.c	2011-08-31 20:30:08 UTC (rev 315933)
@@ -30,6 +30,7 @@
 #include php_ini.h
 #include ext/standard/info.h
 #include ext/standard/php_string.h
+#include php_mysqli.h
 #include php_mysqli_structs.h
 #include mysqli_priv.h
 #include zend_exceptions.h
@@ -526,7 +527,30 @@
 }
 /* }}} */

+#ifdef MYSQLI_USE_MYSQLND
+static MYSQLND *mysqli_convert_zv_to_mysqlnd(zval *zv)
+{
+	if (Z_TYPE_P(zv) == IS_OBJECT  Z_OBJCE_P(zv) == mysqli_link_class_entry) {
+		MY_MYSQL *mysql;
+		MYSQLI_RESOURCE  *my_res;
+		mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(zv TSRMLS_CC);
+		if (!(my_res = (MYSQLI_RESOURCE *)intern-ptr)) {
+			/* We know that we have a mysqli object, so this failure should be emitted */
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, Couldn't fetch %s, intern-zo.ce-name);
+			return NULL;
+		}
+		mysql = ((MY_MYSQL *)my_res-ptr)-mysql;
+		return mysql ? mysql-mysql : NULL;
+	}
+	return NULL;
+}

+static mysqlnd_api_extension_t mysqli_api_ext = {
+	mysqli_module_entry,
+	mysqli_convert_zv_to_mysqlnd
+};
+#endif
+
 /* {{{ PHP_INI_BEGIN
 */
 PHP_INI_BEGIN()
@@ -813,6 +837,11 @@
 	REGISTER_LONG_CONSTANT(MYSQLI_REFRESH_BACKUP_LOG, REFRESH_BACKUP_LOG, CONST_CS | CONST_PERSISTENT);
 #endif

+
+#ifdef MYSQL_USE_MYSQLND
+	mysqlnd_register_api_extension(mysqli_api_ext);
+#endif
+
 	return SUCCESS;
 }
 /* }}} */

Modified: php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c
===
--- php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c	2011-08-31 20:28:08 UTC (rev 315932)
+++ php/php-src/branches/PHP_5_4/ext/mysqlnd/mysqlnd.c	2011-08-31 20:30:08 UTC (rev 315933)
@@ -68,6 +68,7 @@

 static struct st_mysqlnd_plugin_core mysqlnd_plugin_core;

+static HashTable mysqlnd_api_ext_ht;

 /* {{{ mysqlnd_error_list_pdtor */
 static void
@@ -92,6 +93,7 @@
 		mysqlnd_stats_end(mysqlnd_global_stats);
 		mysqlnd_global_stats = NULL;
 		mysqlnd_library_initted = FALSE;
+		zend_hash_destroy(mysqlnd_api_ext_ht);
 	}
 }
 /* }}} */
@@ -2542,11 +2544,47 @@
 		mysqlnd_example_plugin_register(TSRMLS_C);
 		mysqlnd_debug_trace_plugin_register(TSRMLS_C);
 		mysqlnd_register_builtin_authentication_plugins(TSRMLS_C);
+
+		zend_hash_init(mysqlnd_api_ext_ht, 3, NULL, NULL, 1);
 	}
 }
 /* }}} */

+/* {{{ myslqnd_get_api_extensions */
+PHPAPI HashTable *mysqlnd_get_api_extensions()
+{
+	return mysqlnd_api_ext_ht;
+}
+/* }}} */

+/* {{{ mysqlnd_register_api_extension */
+PHPAPI void mysqlnd_register_api_extension(mysqlnd_api_extension_t *apiext)
+{
+	zend_hash_add(mysqlnd_api_ext_ht, apiext-module-name, strlen(apiext-module-name)+1, apiext, 

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

[Matteo Beccati]

mbeccati Wed, 31 Aug 2011 22:12:53 +

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

Log:
Fixed false positive failure on gcov

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

Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt   
2011-08-31 21:12:46 UTC (rev 315935)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt   
2011-08-31 22:12:53 UTC (rev 315936)
@@ -26,7 +26,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 ob_start(); // start output buffering
@@ -38,7 +38,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 curl_close($ch);

Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt
===
--- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt   
2011-08-31 21:12:46 UTC (rev 315935)
+++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt   
2011-08-31 22:12:53 UTC (rev 315936)
@@ -26,7 +26,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 ob_start(); // start output buffering
@@ -38,7 +38,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 curl_close($ch);

Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt  2011-08-31 
21:12:46 UTC (rev 315935)
+++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt  2011-08-31 
22:12:53 UTC (rev 315936)
@@ -26,7 +26,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 ob_start(); // start output buffering
@@ -38,7 +38,7 @@

 fclose($handle);
 unset($handle);
-var_dump( file_get_contents($temp_file) );
+var_dump(preg_replace('/[\r\n]/', ' ', file_get_contents($temp_file)));
 @unlink($temp_file);

 curl_close($ch);

-- 
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/iconv/tests/bug52941.phpt branches/PHP_5_4/ext/iconv/tests/bug52941.phpt trunk/ext/iconv/tests/bug52941.phpt

[Matteo Beccati]

mbeccati Wed, 31 Aug 2011 22:38:20 +

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

Log:
Fixed test. Apparently it was already fixed on PHP_5_3 98% of the cases and
the fix wasn't ported to trunk/PHP_5_4. However the very same test was failing
on my FreeBSD 6.2 box, that appears to also decode the ks_c_5601-1987 parts,
so I've made the test more generic.

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

Modified: php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt
===
--- php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:12:53 UTC (rev 315936)
+++ php/php-src/branches/PHP_5_3/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:38:20 UTC (rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?
---EXPECT--
+--EXPECTF--
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(32) =?ks_c_5601-1987?B?UkU6odk=?=Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(32) =?ks_c_5601-1987?B?UkU6odk=?=Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com

Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt
===
--- php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:12:53 UTC (rev 315936)
+++ php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt  2011-08-31 
22:38:20 UTC (rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?
---EXPECT--
+--EXPECTF--
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com

Modified: php/php-src/trunk/ext/iconv/tests/bug52941.phpt
===
--- php/php-src/trunk/ext/iconv/tests/bug52941.phpt 2011-08-31 22:12:53 UTC 
(rev 315936)
+++ php/php-src/trunk/ext/iconv/tests/bug52941.phpt 2011-08-31 22:38:20 UTC 
(rev 315937)
@@ -28,14 +28,14 @@
 var_dump($decoded['X-Bar']);
 var_dump($decoded['To']);
 ?
---EXPECT--
+--EXPECTF--
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com
 string(17) f...@example.com
-string(29) =?ks_c_5601-1987?B?UkU6odk=?=
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
-string(33) =?ks_c_5601-1987?B?UkU6odk=?= Foo
+string(%d) %s
+string(%d) %sFoo
+string(%d) %sFoo
 string(18) t...@example.com

-- 
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/tests/lang/bug21820.phpt branches/PHP_5_4/tests/lang/bug21820.phpt trunk/tests/lang/bug21820.phpt

[Pierre Joye]

pajoye   Wed, 31 Aug 2011 23:12:35 +

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

Log:
- error msg may vary (parser)

Changed paths:
U   php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt
U   php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt
U   php/php-src/trunk/tests/lang/bug21820.phpt

Modified: php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt
===
--- php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt   2011-08-31 
22:38:20 UTC (rev 315937)
+++ php/php-src/branches/PHP_5_3/tests/lang/bug21820.phpt   2011-08-31 
23:12:35 UTC (rev 315938)
@@ -9,5 +9,5 @@
 echo $arr['foo'];

 ?
---EXPECTREGEX--
-Parse error: (parse|syntax) error, .*expecting `?T_STRING'? or `?T_VARIABLE'? 
or `?T_NUM_STRING'? in .*bug21820.php on line .*
+--EXPECTF--
+Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in 
%sbug21820.php on line %d

Modified: php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt
===
--- php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt   2011-08-31 
22:38:20 UTC (rev 315937)
+++ php/php-src/branches/PHP_5_4/tests/lang/bug21820.phpt   2011-08-31 
23:12:35 UTC (rev 315938)
@@ -10,4 +10,4 @@

 ?
 --EXPECTF--
-Parse error: syntax error, unexpected '' (T_ENCAPSED_AND_WHITESPACE), 
expecting identifier (T_STRING) or variable (T_VARIABLE) or number 
(T_NUM_STRING) in %sbug21820.php on line %d
+Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in 
%sbug21820.php on line %d

Modified: php/php-src/trunk/tests/lang/bug21820.phpt
===
--- php/php-src/trunk/tests/lang/bug21820.phpt  2011-08-31 22:38:20 UTC (rev 
315937)
+++ php/php-src/trunk/tests/lang/bug21820.phpt  2011-08-31 23:12:35 UTC (rev 
315938)
@@ -10,4 +10,4 @@

 ?
 --EXPECTF--
-Parse error: syntax error, unexpected quoted-string and whitespace 
(T_ENCAPSED_AND_WHITESPACE), expecting identifier (T_STRING) or variable 
(T_VARIABLE) or number (T_NUM_STRING) in %sbug21820.php on line %d
+Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%s in 
%sbug21820.php on line %d

-- 
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/pdo_oci/tests/common.phpt branches/PHP_5_4/ext/pdo_oci/tests/common.phpt trunk/ext/pdo_oci/tests/common.phpt

[Johannes Schlüter]

johannes Wed, 31 Aug 2011 23:42:04 +

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

Log:
- Change PDO_oci connection defaults to match Oracle XE defaults, higher chance
  to work out of the box

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

Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/common.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/common.phpt  2011-08-31 
23:12:35 UTC (rev 315938)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/common.phpt  2011-08-31 
23:42:04 UTC (rev 315939)
@@ -18,9 +18,9 @@
$config['ENV']['PDOTEST_PASS'] = getenv('PDO_OCI_TEST_PASS');
$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_OCI_TEST_ATTR');
 } else {
-   $config['ENV']['PDOTEST_DSN'] = 'oci:dbname=test';
+   $config['ENV']['PDOTEST_DSN'] = 
'oci:dbname=localhost/xe;charset=WE8MSWIN1252';
$config['ENV']['PDOTEST_USER'] = 'SYSTEM';
-   $config['ENV']['PDOTEST_PASS'] = 'PASSWORD';
+   $config['ENV']['PDOTEST_PASS'] = 'oracle';
 }

 return $config;

Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/common.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/common.phpt  2011-08-31 
23:12:35 UTC (rev 315938)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/common.phpt  2011-08-31 
23:42:04 UTC (rev 315939)
@@ -18,9 +18,9 @@
$config['ENV']['PDOTEST_PASS'] = getenv('PDO_OCI_TEST_PASS');
$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_OCI_TEST_ATTR');
 } else {
-   $config['ENV']['PDOTEST_DSN'] = 'oci:dbname=test';
+   $config['ENV']['PDOTEST_DSN'] = 
'oci:dbname=localhost/xe;charset=WE8MSWIN1252';
$config['ENV']['PDOTEST_USER'] = 'SYSTEM';
-   $config['ENV']['PDOTEST_PASS'] = 'PASSWORD';
+   $config['ENV']['PDOTEST_PASS'] = 'oracle';
 }

 return $config;

Modified: php/php-src/trunk/ext/pdo_oci/tests/common.phpt
===
--- php/php-src/trunk/ext/pdo_oci/tests/common.phpt 2011-08-31 23:12:35 UTC 
(rev 315938)
+++ php/php-src/trunk/ext/pdo_oci/tests/common.phpt 2011-08-31 23:42:04 UTC 
(rev 315939)
@@ -18,9 +18,9 @@
$config['ENV']['PDOTEST_PASS'] = getenv('PDO_OCI_TEST_PASS');
$config['ENV']['PDOTEST_ATTR'] = getenv('PDO_OCI_TEST_ATTR');
 } else {
-   $config['ENV']['PDOTEST_DSN'] = 'oci:dbname=test';
+   $config['ENV']['PDOTEST_DSN'] = 
'oci:dbname=localhost/xe;charset=WE8MSWIN1252';
$config['ENV']['PDOTEST_USER'] = 'SYSTEM';
-   $config['ENV']['PDOTEST_PASS'] = 'PASSWORD';
+   $config['ENV']['PDOTEST_PASS'] = 'oracle';
 }

 return $config;

-- 
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_error_basic.phpt branches/PHP_5_4/ext/curl/tests/curl_error_basic.phpt trunk/ext/curl/tests/curl_error_basic.phpt

[Matteo Beccati]

mbeccati Thu, 01 Sep 2011 00:45:56 +

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

Log:
Fixed test randomly failing due to different error messages. Also added a skip
section in case fakeURL resolves to an IP address, as some empty error
messages and HTML can be seen in the reports

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

Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_error_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_error_basic.phpt   
2011-08-31 23:42:04 UTC (rev 315939)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_error_basic.phpt   
2011-09-01 00:45:56 UTC (rev 315940)
@@ -4,7 +4,15 @@
 Mattijs Hoitink mattijshoit...@gmail.com
 #Testfest Utrecht 2009
 --SKIPIF--
-?php if (!extension_loaded(curl)) print skip; ?
+?php
+
+if (!extension_loaded(curl)) die(skip\n);
+
+$url = fakeURL;
+$ip = gethostbyname($url);
+if ($ip != $url) die(skip 'fakeURL' resolves to $ip\n);
+
+?
 --FILE--
 ?php
 /*
@@ -21,13 +29,13 @@

 // cURL handler
 $ch = curl_init($url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-ob_start(); // start output buffering
 curl_exec($ch);
-echo Error:  . curl_error($ch);
+var_dump(curl_error($ch));
 curl_close($ch);

 ?
---EXPECT--
+--EXPECTF--
 == Testing curl_error with a fake URL ==
-Error: Couldn't resolve host 'fakeURL'
+string(%d) %sfakeURL%s

Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_error_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_error_basic.phpt   
2011-08-31 23:42:04 UTC (rev 315939)
+++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_error_basic.phpt   
2011-09-01 00:45:56 UTC (rev 315940)
@@ -4,7 +4,15 @@
 Mattijs Hoitink mattijshoit...@gmail.com
 #Testfest Utrecht 2009
 --SKIPIF--
-?php if (!extension_loaded(curl)) print skip; ?
+?php
+
+if (!extension_loaded(curl)) die(skip\n);
+
+$url = fakeURL;
+$ip = gethostbyname($url);
+if ($ip != $url) die(skip 'fakeURL' resolves to $ip\n);
+
+?
 --FILE--
 ?php
 /*
@@ -21,13 +29,13 @@

 // cURL handler
 $ch = curl_init($url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-ob_start(); // start output buffering
 curl_exec($ch);
-echo Error:  . curl_error($ch);
+var_dump(curl_error($ch));
 curl_close($ch);

 ?
---EXPECT--
+--EXPECTF--
 == Testing curl_error with a fake URL ==
-Error: Couldn't resolve host 'fakeURL'
+string(%d) %sfakeURL%s

Modified: php/php-src/trunk/ext/curl/tests/curl_error_basic.phpt
===
--- php/php-src/trunk/ext/curl/tests/curl_error_basic.phpt  2011-08-31 
23:42:04 UTC (rev 315939)
+++ php/php-src/trunk/ext/curl/tests/curl_error_basic.phpt  2011-09-01 
00:45:56 UTC (rev 315940)
@@ -4,7 +4,15 @@
 Mattijs Hoitink mattijshoit...@gmail.com
 #Testfest Utrecht 2009
 --SKIPIF--
-?php if (!extension_loaded(curl)) print skip; ?
+?php
+
+if (!extension_loaded(curl)) die(skip\n);
+
+$url = fakeURL;
+$ip = gethostbyname($url);
+if ($ip != $url) die(skip 'fakeURL' resolves to $ip\n);
+
+?
 --FILE--
 ?php
 /*
@@ -21,13 +29,13 @@

 // cURL handler
 $ch = curl_init($url);
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-ob_start(); // start output buffering
 curl_exec($ch);
-echo Error:  . curl_error($ch);
+var_dump(curl_error($ch));
 curl_close($ch);

 ?
---EXPECT--
+--EXPECTF--
 == Testing curl_error with a fake URL ==
-Error: Couldn't resolve host 'fakeURL'
+string(%d) %sfakeURL%s

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