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

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 09:17:21 +

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

Log:
- fix build when no zend signal support

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

Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-08 
05:59:38 UTC (rev 316404)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-08 
09:17:21 UTC (rev 316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();

if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
   We got here because we got a timeout signal, so we are in a 
signal handler
   at this point. However, we want to be able to timeout any 
user-supplied
@@ -1335,6 +1336,7 @@
   calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}


Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c   2011-09-08 05:59:38 UTC (rev 
316404)
+++ php/php-src/trunk/Zend/zend_execute_API.c   2011-09-08 09:17:21 UTC (rev 
316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();

if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
   We got here because we got a timeout signal, so we are in a 
signal handler
   at this point. However, we want to be able to timeout any 
user-supplied
@@ -1335,6 +1336,7 @@
   calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}


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

2011-09-08 Thread Hannes Magnusson 
bjoriThu, 08 Sep 2011 09:27:47 +

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

Log:
Fix the path to the .pem

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

Modified: php/php-src/branches/PHP_5_3/ext/openssl/tests/bug54992.phpt
===
--- php/php-src/branches/PHP_5_3/ext/openssl/tests/bug54992.phpt
2011-09-08 09:17:21 UTC (rev 316405)
+++ php/php-src/branches/PHP_5_3/ext/openssl/tests/bug54992.phpt
2011-09-08 09:27:47 UTC (rev 316406)
@@ -8,7 +8,7 @@
 ?php
 $context = stream_context_create();

-stream_context_set_option($context, 'ssl', 'local_cert', ./bug54992.pem);
+stream_context_set_option($context, 'ssl', 'local_cert', __DIR__ . 
/bug54992.pem);
 stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
 $server = stream_socket_server('ssl://127.0.0.1:64321', $errno, $errstr,
STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
@@ -22,7 +22,7 @@
array(
'ssl' = array(
'verify_peer'   = true,
-   'cafile'= 'bug54992-ca.pem',
+   'cafile'= __DIR__ . 
'/bug54992-ca.pem',
'CN_match'  = 'buga_buga',
)
)

Modified: php/php-src/branches/PHP_5_4/ext/openssl/tests/bug54992.phpt
===
--- php/php-src/branches/PHP_5_4/ext/openssl/tests/bug54992.phpt
2011-09-08 09:17:21 UTC (rev 316405)
+++ php/php-src/branches/PHP_5_4/ext/openssl/tests/bug54992.phpt
2011-09-08 09:27:47 UTC (rev 316406)
@@ -8,7 +8,7 @@
 ?php
 $context = stream_context_create();

-stream_context_set_option($context, 'ssl', 'local_cert', ./bug54992.pem);
+stream_context_set_option($context, 'ssl', 'local_cert', __DIR__ . 
/bug54992.pem);
 stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
 $server = stream_socket_server('ssl://127.0.0.1:64321', $errno, $errstr,
STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
@@ -22,7 +22,7 @@
array(
'ssl' = array(
'verify_peer'   = true,
-   'cafile'= 'bug54992-ca.pem',
+   'cafile'= __DIR__ . 
'/bug54992-ca.pem',
'CN_match'  = 'buga_buga',
)
)

Modified: php/php-src/trunk/ext/openssl/tests/bug54992.phpt
===
--- php/php-src/trunk/ext/openssl/tests/bug54992.phpt   2011-09-08 09:17:21 UTC 
(rev 316405)
+++ php/php-src/trunk/ext/openssl/tests/bug54992.phpt   2011-09-08 09:27:47 UTC 
(rev 316406)
@@ -8,7 +8,7 @@
 ?php
 $context = stream_context_create();

-stream_context_set_option($context, 'ssl', 'local_cert', ./bug54992.pem);
+stream_context_set_option($context, 'ssl', 'local_cert', __DIR__ . 
/bug54992.pem);
 stream_context_set_option($context, 'ssl', 'allow_self_signed', true);
 $server = stream_socket_server('ssl://127.0.0.1:64321', $errno, $errstr,
STREAM_SERVER_BIND|STREAM_SERVER_LISTEN, $context);
@@ -22,7 +22,7 @@
array(
'ssl' = array(
'verify_peer'   = true,
-   'cafile'= 'bug54992-ca.pem',
+   'cafile'= __DIR__ . 
'/bug54992-ca.pem',
'CN_match'  = 'buga_buga',
)
)

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

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 10:00:47 +

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

Log:
- skip if no hash

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

Modified: php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug43143.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug43143.phpt 2011-09-08 
09:27:47 UTC (rev 316406)
+++ php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug43143.phpt 2011-09-08 
10:00:47 UTC (rev 316407)
@@ -1,7 +1,8 @@
 --TEST--
 Bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB)
 --SKIPIF--
-?php if (!extension_loaded(mcrypt)) print skip; ?
+?php if (!extension_loaded(mcrypt)) print skip;
+if (!extension_loaded(hash)) print skip; ?
 --FILE--
 ?php
 echo ECB\n;

Modified: php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug43143.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug43143.phpt 2011-09-08 
09:27:47 UTC (rev 316406)
+++ php/php-src/branches/PHP_5_4/ext/mcrypt/tests/bug43143.phpt 2011-09-08 
10:00:47 UTC (rev 316407)
@@ -1,7 +1,8 @@
 --TEST--
 Bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB)
 --SKIPIF--
-?php if (!extension_loaded(mcrypt)) print skip; ?
+?php if (!extension_loaded(mcrypt)) print skip;
+if (!extension_loaded(hash)) print skip; ?
 --FILE--
 ?php
 echo ECB\n;

Modified: php/php-src/trunk/ext/mcrypt/tests/bug43143.phpt
===
--- php/php-src/trunk/ext/mcrypt/tests/bug43143.phpt2011-09-08 09:27:47 UTC 
(rev 316406)
+++ php/php-src/trunk/ext/mcrypt/tests/bug43143.phpt2011-09-08 10:00:47 UTC 
(rev 316407)
@@ -1,7 +1,8 @@
 --TEST--
 Bug #43143 (Warning about empty IV with MCRYPT_MODE_ECB)
 --SKIPIF--
-?php if (!extension_loaded(mcrypt)) print skip; ?
+?php if (!extension_loaded(mcrypt)) print skip;
+if (!extension_loaded(hash)) print skip; ?
 --FILE--
 ?php
 echo ECB\n;

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/zlib/tests/data.inc trunk/ext/zlib/tests/data.inc

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 10:14:38 +

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

Log:
- force LF

Changed paths:
UU  php/php-src/branches/PHP_5_4/ext/zlib/tests/data.inc
_U  php/php-src/trunk/ext/zlib/tests/data.inc

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/data.inc
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/data.inc2011-09-08 
10:00:47 UTC (rev 316407)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/data.inc2011-09-08 
10:14:38 UTC (rev 316408)
@@ -85,4 +85,4 @@

 QUOTE;

-?
\ No newline at end of file
+?


Property changes on: php/php-src/branches/PHP_5_4/ext/zlib/tests/data.inc
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: php/php-src/trunk/ext/zlib/tests/data.inc
___
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/zlib/tests/ data.inc

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 10:15:10 +

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

Log:
- force LF

Changed paths:
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/data.inc


Property changes on: php/php-src/branches/PHP_5_3/ext/zlib/tests/data.inc
___
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/zlib/tests/gzfile_basic.phpt branches/PHP_5_3/ext/zlib/tests/gzfile_basic2.phpt branches/PHP_5_3/ext/zlib/tests/gzfilegzreadfile.phpt branches/PHP_5_3

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 10:20:38 +

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

Log:
- force LF and fix... and blame me for not reading the code correctly, zlib 
tests pass now, linux/bsd/win 100%

Changed paths:
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfile_basic.phpt
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfile_basic2.phpt
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/gzfilegzreadfile.phpt
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_basic.phpt
_U  php/php-src/branches/PHP_5_3/ext/zlib/tests/readgzfile_basic2.phpt
U   php/php-src/branches/PHP_5_4/ext/zlib/tests/001.phpt
UU  php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic.phpt
UU  php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic2.phpt
_U  php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfilegzreadfile.phpt
_U  php/php-src/branches/PHP_5_4/ext/zlib/tests/readgzfile_basic.phpt
_U  php/php-src/branches/PHP_5_4/ext/zlib/tests/readgzfile_basic2.phpt
_U  php/php-src/trunk/ext/zlib/tests/gzfile_basic.phpt
_U  php/php-src/trunk/ext/zlib/tests/gzfile_basic2.phpt
_U  php/php-src/trunk/ext/zlib/tests/gzfilegzreadfile.phpt
_U  php/php-src/trunk/ext/zlib/tests/readgzfile_basic.phpt
_U  php/php-src/trunk/ext/zlib/tests/readgzfile_basic2.phpt


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


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


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


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


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

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/001.phpt
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/001.phpt2011-09-08 
10:15:10 UTC (rev 316409)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/001.phpt2011-09-08 
10:20:38 UTC (rev 316410)
@@ -29,4 +29,4 @@
 100 36864
 Strings are equal
 5 15
-Strings are equal
\ No newline at end of file
+Strings are equal

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic.phpt   
2011-09-08 10:15:10 UTC (rev 316409)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic.phpt   
2011-09-08 10:20:38 UTC (rev 316410)
@@ -36,4 +36,4 @@
   [2]=
   string(17) for all languages
 }
-===DONE===
\ No newline at end of file
+===DONE===


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

Modified: php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic2.phpt
===
--- php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic2.phpt  
2011-09-08 10:15:10 UTC (rev 316409)
+++ php/php-src/branches/PHP_5_4/ext/zlib/tests/gzfile_basic2.phpt  
2011-09-08 10:20:38 UTC (rev 316410)
@@ -36,4 +36,4 @@
   [2]=
   string(17) for all languages
 }
-===DONE===
\ No newline at end of file
+===DONE===


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


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


Property changes on: 
php/php-src/branches/PHP_5_4/ext/zlib/tests/readgzfile_basic.phpt
___
Modified: svn:eol-style
   - native
   + LF
Added: eol-style
   + LF


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


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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt trunk/ext/standard/tests/file/005_variation2-win32.phpt

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 11:24:33 +

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

Log:
- fix test

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt
U   php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt  
2011-09-08 10:24:45 UTC (rev 316411)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt  
2011-09-08 11:24:33 UTC (rev 316412)
@@ -107,11 +107,8 @@
 Warning: filectime(): stat failed for | in %s on line %d


-*** testing touch ***
-Warning: touch(): %s in %s on line %d
+*** testing touch ***bool(false)
 bool(false)
-
-Warning: touch(): %s in %s on line %d
 bool(false)

 Warning: touch(): %s in %s on line %d
@@ -119,7 +116,4 @@

 Warning: touch(): %s in %s on line %d
 bool(false)
-
-Warning: touch(): %s in %s on line %d
-bool(false)
 Done

Modified: php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt 
2011-09-08 10:24:45 UTC (rev 316411)
+++ php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt 
2011-09-08 11:24:33 UTC (rev 316412)
@@ -107,11 +107,8 @@
 Warning: filectime(): stat failed for | in %s on line %d


-*** testing touch ***
-Warning: touch(): %s in %s on line %d
+*** testing touch ***bool(false)
 bool(false)
-
-Warning: touch(): %s in %s on line %d
 bool(false)

 Warning: touch(): %s in %s on line %d
@@ -119,7 +116,4 @@

 Warning: touch(): %s in %s on line %d
 bool(false)
-
-Warning: touch(): %s in %s on line %d
-bool(false)
 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_3/ext/mysql/tests/001.phpt branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt branches/PHP_5_3/ext/my

2011-09-08 Thread Ferenc Kovacs 
tyrael   Thu, 08 Sep 2011 11:30:58 +

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

Log:
skip these tests if can't connect to mysql

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt
U   php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt
U   php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt
U   php/php-src/trunk/ext/mysql/tests/001.phpt
U   php/php-src/trunk/ext/mysql/tests/mysql_connect.phpt
U   php/php-src/trunk/ext/mysql/tests/mysql_max_links.phpt
U   php/php-src/trunk/ext/mysql/tests/mysql_sql_safe_mode.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt   2011-09-08 
11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/001.phpt   2011-09-08 
11:30:58 UTC (rev 316413)
@@ -1,7 +1,10 @@
 --TEST--
 mysql connect
 --SKIPIF--
-?php include 'skipif.inc'; ?
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 require_once('connect.inc');

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt 
2011-09-08 11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_connect.phpt 
2011-09-08 11:30:58 UTC (rev 316413)
@@ -1,7 +1,10 @@
 --TEST--
 mysql_connect()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 include_once connect.inc;

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt   
2011-09-08 11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_max_links.phpt   
2011-09-08 11:30:58 UTC (rev 316413)
@@ -3,6 +3,7 @@
 --SKIPIF--
 ?php
 require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
 ?
 --INI--
 mysql.max_links=2

Modified: php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt   
2011-09-08 11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_3/ext/mysql/tests/mysql_sql_safe_mode.phpt   
2011-09-08 11:30:58 UTC (rev 316413)
@@ -3,6 +3,7 @@
 --SKIPIF--
 ?php
 require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
 $link = @mysql_connect(, , , true);
 if ($link)
die(skip Test cannot be run if annonymous connections are allowed);

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt   2011-09-08 
11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/001.phpt   2011-09-08 
11:30:58 UTC (rev 316413)
@@ -1,7 +1,10 @@
 --TEST--
 mysql connect
 --SKIPIF--
-?php include 'skipif.inc'; ?
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 require_once('connect.inc');

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt 
2011-09-08 11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_connect.phpt 
2011-09-08 11:30:58 UTC (rev 316413)
@@ -1,7 +1,10 @@
 --TEST--
 mysql_connect()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 include_once connect.inc;

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt   
2011-09-08 11:24:33 UTC (rev 316412)
+++ php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_max_links.phpt   
2011-09-08 11:30:58 UTC (rev 316413)
@@ -3,6 +3,7 @@
 --SKIPIF--
 ?php
 require_once('skipif.inc');
+require_once('skipifconnectfailure.inc');
 ?
 --INI--
 mysql.max_links=2

Modified: php/php-src/branches/PHP_5_4/ext/mysql/tests/mysql_sql_safe_mode.phpt

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt trunk/ext/standard/tests/file/rename_variation13-win32.phpt

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 11:52:37 +

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

Log:
- fix test, again...

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
U   php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
  2011-09-08 11:43:26 UTC (rev 316414)
+++ 
php/php-src/branches/PHP_5_4/ext/standard/tests/file/rename_variation13-win32.phpt
  2011-09-08 11:52:37 UTC (rev 316415)
@@ -101,12 +101,10 @@
 bool(false)
 -- 5 testing ' ' string --

-Warning: rename() expects parameter 2 to be a valid path, string given in 
%srename_variation13-win32.php on line 42
+Warning: rename(%s): The filename, directory name, or volume label syntax is 
incorrect. (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, string given in 
%srename_variation13-win32.php on line 43
-
-Warning: rename() expects parameter 1 to be a valid path, string given in 
%srename_variation13-win32.php on line 50
+Warning: rename(%s): The filename, directory name, or volume label syntax is 
incorrect. (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 6 testing '


Modified: 
php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt
===
--- php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 
2011-09-08 11:43:26 UTC (rev 316414)
+++ php/php-src/trunk/ext/standard/tests/file/rename_variation13-win32.phpt 
2011-09-08 11:52:37 UTC (rev 316415)
@@ -71,74 +71,72 @@
 -- 0 testing '-1' integer --
 bool(true)

-Warning: rename(-1,%srenameVar13/afile.tmp): The system cannot find the file 
specified. (code: 2) in %srename_variation13-win32.php on line %d
+Warning: rename(-1,%safile.tmp): The system cannot find the file specified. 
(code: 2) in %srename_variation13-win32.php on line 50
 bool(false)
 -- 1 testing '1' boolean --
 bool(true)

-Warning: rename(1,%srenameVar13/afile.tmp): The system cannot find the file 
specified. (code: 2) in %srename_variation13-win32.php on line %d
+Warning: rename(1,%safile.tmp): The system cannot find the file specified. 
(code: 2) in %srename_variation13-win32.php on line 50
 bool(false)
 -- 2 testing '' boolean --

-Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(%safile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(,%safile.tmp): Invalid argument in 
%srename_variation13-win32.php on line 50
 bool(false)
 -- 3 testing '' NULL --

-Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(%safile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(,%safile.tmp): Invalid argument in 
%srename_variation13-win32.php on line 50
 bool(false)
 -- 4 testing '' string --

-Warning: rename(%srenameVar13/afile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(%safile.tmp,): Invalid argument in 
%srename_variation13-win32.php on line 42
 bool(false)

-Warning: rename(,%srenameVar13/afile.tmp): Invalid argument in 
%srename_variation13-win32.php on line %d
+Warning: rename(,%safile.tmp): Invalid argument in 
%srename_variation13-win32.php on line 50
 bool(false)
 -- 5 testing ' ' string --

-Warning: rename() expects parameter 2 to be a valid path, string given in 
%srename_variation13-win32.php on line %d
+Warning: rename(%s): The filename, directory name, or volume label syntax is 
incorrect. (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)

-Warning: file_exists() expects parameter 1 to be a valid path, string given in 
%srename_variation13-win32.php on line %d
-
-Warning: rename() expects parameter 1 to be a valid path, string given in 
%srename_variation13-win32.php on line %d
+Warning: rename(%s): The filename, directory name, or volume label syntax is 
incorrect. (code: 123) in %srename_variation13-win32.php on line %d
 bool(false)
 -- 6 testing '
-Warning: rename() expects parameter 2 to be a valid path, string given in 
%srename_variation13-win32.php on line %d
+
+Warning: rename() expects parameter 2 to be a valid path, string given in 
%srename_variation13-win32.php on line 42
 bool(false)

-Warning: file_exists() expects

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/curl/interface.c branches/PHP_5_3/ext/curl/tests/bug48203.phpt branches/PHP_5_3/ext/curl/tests/bug54798.phpt branches/PHP_5_4/ex

2011-09-08 Thread Hannes Magnusson 
bjoriThu, 08 Sep 2011 14:37:18 +

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

Log:
Fixed bug#54798 Segfault when CURLOPT_STDERR file pointer is closed before 
calling curl_exec

Bug: https://bugs.php.net/54798 (Assigned) Segfault when CURLOPT_STDERR file 
pointer is closed before calling curl_exec
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/ext/curl/interface.c
U   php/php-src/branches/PHP_5_3/ext/curl/tests/bug48203.phpt
A   php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt
U   php/php-src/branches/PHP_5_4/ext/curl/interface.c
U   php/php-src/branches/PHP_5_4/ext/curl/tests/bug48203.phpt
A   php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt
U   php/php-src/trunk/ext/curl/interface.c
U   php/php-src/trunk/ext/curl/tests/bug48203.phpt
A   php/php-src/trunk/ext/curl/tests/bug54798.phpt

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS	2011-09-08 13:46:41 UTC (rev 316416)
+++ php/php-src/branches/PHP_5_3/NEWS	2011-09-08 14:37:18 UTC (rev 316417)
@@ -13,6 +13,10 @@
   . Fixed bug #55504 (Content-Type header is not parsed correctly on
 HTTP POST request). (Hannes)

+- Curl:
+  . Fixed bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed
+before calling curl_exec). (Hannes)
+
 - DateTime:
   . Fixed bug #48476 (cloning extended DateTime class without calling
 parent::__constr crashed PHP). (Hannes)

Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c	2011-09-08 13:46:41 UTC (rev 316416)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c	2011-09-08 14:37:18 UTC (rev 316417)
@@ -2213,6 +2213,26 @@

 	_php_curl_cleanup_handle(ch);

+	if (ch-handlers-std_err) {
+		php_stream  *stream;
+		stream = (php_stream*)zend_fetch_resource(ch-handlers-std_err TSRMLS_CC, -1, NULL, NULL, 2, php_file_le_stream(), php_file_le_pstream());
+		if (stream == NULL) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, CURLOPT_STDERR resource has gone away, resetting to stderr);
+			zval_ptr_dtor(ch-handlers-std_err);
+			curl_easy_setopt(ch-cp, CURLOPT_STDERR, stderr);
+		}
+	}
+	if (ch-handlers-read  ch-handlers-read-stream) {
+		php_stream  *stream;
+		stream = (php_stream*)zend_fetch_resource(ch-handlers-read-stream TSRMLS_CC, -1, NULL, NULL, 2, php_file_le_stream(), php_file_le_pstream());
+		if (stream == NULL) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, CURLOPT_INFILE resource has gone away, resetting to default);
+			zval_ptr_dtor(ch-handlers-read-stream);
+			ch-handlers-read-fd = 0;
+			ch-handlers-read-fp = 0;
+			curl_easy_setopt(ch-cp, CURLOPT_INFILE, (void *) ch);
+		}
+	}
 	error = curl_easy_perform(ch-cp);
 	SAVE_CURL_ERROR(ch, error);
 	/* CURLE_PARTIAL_FILE is returned by HEAD requests */

Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/bug48203.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/bug48203.phpt	2011-09-08 13:46:41 UTC (rev 316416)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/bug48203.phpt	2011-09-08 14:37:18 UTC (rev 316417)
@@ -18,16 +18,19 @@

 curl_setopt($ch, CURLOPT_VERBOSE, 1);
 curl_setopt($ch, CURLOPT_STDERR, $fp);
-curl_setopt($ch, CURLOPT_URL, );
+curl_setopt($ch, CURLOPT_URL, getenv('PHP_CURL_HTTP_REMOTE_SERVER'));

 fclose($fp); // -- premature close of $fp caused a crash!

 curl_exec($ch);
+curl_close($ch);

 echo Ok\n;

 ?
 --CLEAN--
 ?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?
---EXPECT--
+--EXPECTF--
+Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %sbug48203.php on line %d
+%A
 Ok

Added: php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt
===
--- php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt	(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt	2011-09-08 14:37:18 UTC (rev 316417)
@@ -0,0 +1,66 @@
+--TEST--
+Bug #48203 (Crash when file pointers passed to curl are closed before calling curl_exec)
+--SKIPIF--
+?php
+if (!extension_loaded(curl)) {
+	exit(skip curl extension not loaded);
+}
+if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER'))  {
+	exit(skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined);
+}
+?
+--FILE--
+?php
+
+function checkForClosedFilePointer($curl_option, $description) {
+	$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w+');
+
+	$ch = curl_init();
+
+	// we also need CURLOPT_VERBOSE to be set to test CURLOPT_STDERR properly
+	if (CURLOPT_STDERR == $curl_option) {
+		curl_setopt($ch, CURLOPT_VERBOSE, 1);
+	}
+
+if (CURLOPT_INFILE == $curl_option) {
+curl_setopt($ch, CURLOPT_UPLOAD,

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/mbstring/ mbstring.c

2011-09-08 Thread Rui Hirokawa 
hirokawa Thu, 08 Sep 2011 15:19:18 +

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

Log:
2nd arguments is necessary in mb_parse_str because register_globals was removed 
in PHP 5.4.

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c

Modified: php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c2011-09-08 
14:37:18 UTC (rev 316417)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/mbstring.c2011-09-08 
15:19:18 UTC (rev 316418)
@@ -245,7 +245,7 @@
ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()

-ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_parse_str, 0, 0, 2)
ZEND_ARG_INFO(0, encoded_string)
ZEND_ARG_INFO(1, result)
 ZEND_END_ARG_INFO()
@@ -2025,7 +2025,7 @@
 #define IS_SJIS1(c) c)=0x81  (c)=0x9f) || ((c)=0xe0  (c)=0xf5)) ? 
1 : 0)
 #define IS_SJIS2(c) c)=0x40  (c)=0x7e) || ((c)=0x80  (c)=0xfc)) ? 
1 : 0)

-/* {{{ proto bool mb_parse_str(string encoded_string [, array result])
+/* {{{ proto bool mb_parse_str(string encoded_string , array result)
Parses GET/POST/COOKIE data and sets global variables */
 PHP_FUNCTION(mb_parse_str)
 {
@@ -2036,7 +2036,7 @@
const mbfl_encoding *detected;

track_vars_array = NULL;
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|z, encstr, 
encstr_len, track_vars_array) == FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz, encstr, 
encstr_len, track_vars_array) == FAILURE) {
return;
}


-- 
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/spl/spl_directory.c branches/PHP_5_4/ext/spl/tests/SplFileObject_fflush_basic_001.phpt branches/PHP_5_4/ext/spl/tests/SplFileObject_ftruncate_error_00

2011-09-08 Thread Etienne Kneuss 
colder   Thu, 08 Sep 2011 15:52:59 +

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

Log:
SplFileObject does not accept directories. It did not check for that and 
blindly opened the directory, which works on linux but fails on windows. Now 
SplFileObject uses a stat() call to make sure it isn't a directory, if it is, 
it fails with an exception. Tests have been changed accordingly.

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
U   php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt
U   php/php-src/trunk/ext/spl/spl_directory.c
U   php/php-src/trunk/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
U   php/php-src/trunk/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
U   php/php-src/trunk/ext/spl/tests/fileobject_003.phpt

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c	2011-09-08 15:20:17 UTC (rev 316419)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c	2011-09-08 15:52:59 UTC (rev 316420)
@@ -,6 +,7 @@
 	char *p1, *p2;
 	char *tmp_path;
 	int   tmp_path_len;
+	zval  tmp;
 	zend_error_handling error_handling;

 	zend_replace_error_handling(EH_THROW, spl_ce_RuntimeException, error_handling TSRMLS_CC);
@@ -2243,6 +2244,16 @@
 		intern-u.file.open_mode = r;
 		intern-u.file.open_mode_len = 1;
 	}
+
+	php_stat(intern-file_name, intern-file_name_len, FS_IS_DIR, tmp TSRMLS_CC);
+
+	if (Z_LVAL(tmp)) {
+		zend_restore_error_handling(error_handling TSRMLS_CC);
+		intern-u.file.open_mode = NULL;
+		intern-file_name = NULL;
+		zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, Cannot use SplFileObject with directories);
+		return;
+	}

 	if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == SUCCESS) {
 		tmp_path_len = strlen(intern-u.file.stream-orig_path);

Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fflush_basic_001.phpt	2011-09-08 15:20:17 UTC (rev 316419)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fflush_basic_001.phpt	2011-09-08 15:52:59 UTC (rev 316420)
@@ -17,9 +17,12 @@
 var $varname;

 function stream_open($path, $mode, $options, $opened_path)
-{
+{
 return true;
 }
+
+function url_stat() {
+}
 }
 stream_wrapper_register(SPLtest, VariableStream);
 $ftruncate_test = ;

Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt	2011-09-08 15:20:17 UTC (rev 316419)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt	2011-09-08 15:52:59 UTC (rev 316420)
@@ -12,6 +12,9 @@
 {
 return true;
 }
+
+function url_stat() {
+}
 }
 stream_wrapper_register(SPLtest, VariableStream);
 $ftruncate_test = ;

Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt	2011-09-08 15:20:17 UTC (rev 316419)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt	2011-09-08 15:52:59 UTC (rev 316420)
@@ -18,18 +18,21 @@
 	var_dump($o == $c);
 	var_dump($o-getPathname() == $c-getPathname());

-	$f = new SplFileObject($name);
-	var_dump($name);
-	var_dump($f-getPathName());
-	$l = substr($f-getPathName(), -1);
-	var_dump($l != '/'  $l != '\\'  $l == $lc);
-	var_dump($f-getFileName());
-	$l = substr($f-getFileName(), -1);
-	var_dump($l != '/'  $l != '\\'  $l == $lc);
-	var_dump($f-getPath());
-	$l = substr($f-getPath(), -1);
-	var_dump($l != '/'  $l != '\\'  $l == $lp);
-
+	try {
+		$f = new SplFileObject($name);
+		var_dump($name);
+		var_dump($f-getPathName());
+		$l = substr($f-getPathName(), -1);
+		var_dump($l != '/'  $l != '\\'  $l == $lc);
+		var_dump($f-getFileName());
+		$l = substr($f-getFileName(), -1);
+		var_dump($l != '/'  $l != '\\'  $l == $lc);
+		var_dump($f-getPath());
+		$l = substr($f-getPath(), -1);
+		var_dump($l != '/'  $l != '\\'  $l == $lp);
+	} catch (LogicException $e) {
+		echo LogicException: .$e-getMessage().\n;
+	}
 	$fo = $o-openFile();
 	var_dump($fo-getPathName(), $fo-getFileName(), $fo-getPath());
 }
@@ -84,14 +87,8 @@
 bool(false)
 bool(true)
 bool(true)
-%s(%d) %stests/
+LogicException: Cannot use SplFileObject with directories
 string(%d) %stests
-bool(true)
-string(5) tests
-bool(true)
-string(%d)

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_002.phpt branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_error.phpt branches/PHP_5_4/ext/spl/tests/SplFileObject_

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 16:10:07 +

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

Log:
- force LF

Changed paths:
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_002.phpt
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_error.phpt
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
U   
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
_U  php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_001.phpt
_U  php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_001a.txt
_U  php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_001b.txt
U   php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_002.phpt
U   php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_error.phpt
U   php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
U   php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
_U  php/php-src/trunk/ext/spl/tests/fileobject_001.phpt

Modified: 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_002.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_002.phpt   
2011-09-08 15:52:59 UTC (rev 316420)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_002.phpt   
2011-09-08 16:10:07 UTC (rev 316421)
@@ -2,7 +2,7 @@
 SplFileObject::fputcsv(): Checking data after calling the function
 --FILE--
 ?php
-$fo = new SplFileObject('SplFileObject::fputcsv.csv', 'w');
+$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w');

 $data = array(1, 2, 'foo', 'haha', array(4, 5, 6), 1.3, null);


Modified: 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_error.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_error.phpt 
2011-09-08 15:52:59 UTC (rev 316420)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_error.phpt 
2011-09-08 16:10:07 UTC (rev 316421)
@@ -2,7 +2,7 @@
 SplFileObject::fputcsv(): error conditions
 --FILE--
 ?php
-$fo = new SplFileObject('SplFileObject::fputcsv.csv', 'w');
+$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w');

 echo *** Testing error conditions ***\n;
 // zero argument

Modified: 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
   2011-09-08 15:52:59 UTC (rev 316420)
+++ 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation13.phpt
   2011-09-08 16:10:07 UTC (rev 316421)
@@ -8,7 +8,7 @@

 echo *** Testing fputcsv() : with default enclosure  delimiter of two chars 
***\n;

-$fo = new SplFileObject('SplFileObject::fputcsv.csv', 'w');
+$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w');

 var_dump($fo-fputcsv(array('water', 'fruit'), ',,', ''));


Modified: 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
   2011-09-08 15:52:59 UTC (rev 316420)
+++ 
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv_variation14.phpt
   2011-09-08 16:10:07 UTC (rev 316421)
@@ -8,7 +8,7 @@

 echo *** Testing fputcsv() : with enclosure  delimiter of two chars and file 
opened in read mode ***\n;

-$fo = new SplFileObject('SplFileObject::fputcsv.csv', 'w');
+$fo = new SplFileObject('SplFileObject_fputcsv.csv', 'w');

 var_dump($fo-fputcsv(array('water', 'fruit'), ',,', ''));



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


Property changes on: 
php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_001a.txt
___
Modified: svn:eol-style
   - native
   + LF


Property changes on: 
php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_001b.txt
___
Modified: svn:eol-style
   - native
   + LF

Modified: php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_002.phpt
===
--- php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_002.phpt  
2011-09-08 15:52:59 UTC (rev 316420)
+++ php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv_002.phpt  
2011-09-08 16:10:07 UTC (rev 316421)
@@ -2,7 +2,7 @@
 SplFileObject::fputcsv(): Checking data after calling the function
 --FILE--
 ?php
-$fo = new SplFileObject('SplFileObject::fputcsv.csv', 'w');
+$fo = new

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/tests/fileobject_002.phpt branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt trunk/ext/spl/tests/fileobject_002.phpt trunk/ext/spl/tests/fileobjec

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 16:11:03 +

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

Log:
- force LF

Changed paths:
_U  php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_002.phpt
_U  php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt
_U  php/php-src/trunk/ext/spl/tests/fileobject_002.phpt
_U  php/php-src/trunk/ext/spl/tests/fileobject_003.phpt


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


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


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


Property changes on: php/php-src/trunk/ext/spl/tests/fileobject_003.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/ext/date/ TODO

2011-09-08 Thread Derick Rethans 
derick   Thu, 08 Sep 2011 16:57:41 +

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

Log:
- Updated to-do.

Changed paths:
U   php/php-src/trunk/ext/date/TODO

Modified: php/php-src/trunk/ext/date/TODO
===
--- php/php-src/trunk/ext/date/TODO 2011-09-08 16:11:03 UTC (rev 316422)
+++ php/php-src/trunk/ext/date/TODO 2011-09-08 16:57:41 UTC (rev 316423)
@@ -1,6 +1,5 @@
 - Port over my 200 test cases to .phpt format.
 - Write an error handler for unexpected characters while parsing dates.
 - Cache lookups for timezone information.
-- Optimize parsing @ with a negative timestamp.
 - Make sure that date_default_timezone_set() validates the passed timezone
   identifier.

-- 
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/mysqli_connect.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults

2011-09-08 Thread Christopher Jones 
sixd Thu, 08 Sep 2011 17:40:15 +

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

Log:
Fix skipifs to match other tests for the case when connection fails

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt
U   
php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
U   php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo.phpt
U   
php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
U   php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_debug_ini.phpt
U   php/php-src/trunk/ext/mysqli/tests/mysqli_connect.phpt
U   php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo.phpt
U   php/php-src/trunk/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
U   php/php-src/trunk/ext/mysqli/tests/mysqli_debug_ini.phpt

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
-?php require_once('skipifemb.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 	require_once(connect.inc);
@@ -146,7 +149,7 @@
 	print done!;
 ?
 --EXPECTF--
-Warning: mysqli_connect(): (%d/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
+Warning: mysqli_connect(): (%s/%d): Access denied for user '%s'@'%s' (using password: YES) in %s on line %d
 array(1) {
   [%u|b%testing]=
   %unicode|string%(21) mysqli.default_socket

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
-?php require_once('skipifemb.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 	require_once(connect.inc);
@@ -144,7 +147,7 @@
 	print done!;
 ?
 --EXPECTF--
-Warning: mysqli::mysqli(): (%d/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
+Warning: mysqli::mysqli(): (%s/%d): Access denied for user '%sunknown%s'@'%s' (using password: %s) in %s on line %d
 ... and now Exceptions
 Access denied for user '%s'@'%s' (using password: %s)
 done!
\ No newline at end of file

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_connect_oo_defaults.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 new mysqli()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
-?php require_once('skipifemb.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');
+?
 --FILE--
 ?php
 	require_once(connect.inc);

Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_debug_ini.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -4,6 +4,7 @@
 ?php
 require_once('skipif.inc');
 require_once('skipifemb.inc');
+require_once('skipifconnectfailure.inc');

 if (!function_exists('mysqli_debug'))
  	die(skip mysqli_debug() not available);

Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt
===
--- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 16:57:41 UTC (rev 316423)
+++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_connect.phpt	2011-09-08 17:40:15 UTC (rev 316424)
@@ -1,8 +1,11 @@
 --TEST--
 mysqli_connect()
 --SKIPIF--
-?php require_once('skipif.inc'); ?
-?php require_once('skipifemb.inc'); ?
+?php
+require_once('skipif.inc');
+require_once('skipifemb.inc');

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt branches/PHP_5_4/ext/pdo_mysql/tests/

2011-09-08 Thread Christopher Jones 
sixd Thu, 08 Sep 2011 17:52:45 +

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

Log:
Fix skipifs

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

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
===
--- 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2011-09-08 17:40:15 UTC (rev 316424)
+++ 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2011-09-08 17:52:45 UTC (rev 316425)
@@ -3,6 +3,8 @@
 --SKIPIF--
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 ?
 --FILE--
 ?php

Modified: 
php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt   
2011-09-08 17:40:15 UTC (rev 316424)
+++ php/php-src/branches/PHP_5_3/ext/pdo_mysql/tests/pdo_mysql_interface.phpt   
2011-09-08 17:52:45 UTC (rev 316425)
@@ -4,6 +4,7 @@
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
die(skip Transactional engine not found);

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
===
--- 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2011-09-08 17:40:15 UTC (rev 316424)
+++ 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
 2011-09-08 17:52:45 UTC (rev 316425)
@@ -3,6 +3,8 @@
 --SKIPIF--
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 ?
 --FILE--
 ?php

Modified: 
php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt   
2011-09-08 17:40:15 UTC (rev 316424)
+++ php/php-src/branches/PHP_5_4/ext/pdo_mysql/tests/pdo_mysql_interface.phpt   
2011-09-08 17:52:45 UTC (rev 316425)
@@ -4,6 +4,7 @@
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
die(skip Transactional engine not found);

Modified: 
php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
2011-09-08 17:40:15 UTC (rev 316424)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql___construct_options.phpt
2011-09-08 17:52:45 UTC (rev 316425)
@@ -3,6 +3,8 @@
 --SKIPIF--
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 ?
 --FILE--
 ?php

Modified: php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt
===
--- php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt  
2011-09-08 17:40:15 UTC (rev 316424)
+++ php/php-src/trunk/ext/pdo_mysql/tests/pdo_mysql_interface.phpt  
2011-09-08 17:52:45 UTC (rev 316425)
@@ -4,6 +4,7 @@
 ?php
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
 $db = MySQLPDOTest::factory();
 if (false == MySQLPDOTest::detect_transactional_mysql_engine($db))
die(skip Transactional engine not found);

-- 
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_3/NEWS branches/PHP_5_3/ext/curl/interface.c branches/PHP_5_3/ext/curl/tests/bug48203.phpt branches/PHP_5_3/ext/curl/tests/bug54798.phpt branches/PHP_5_

2011-09-08 Thread Alexey Shein 
Hello, Hannes!
It seems your fix is wrong, bug54798 still fails on my machine on
trunk, 5.4 and 5.3 branches (ubuntu x64).
IMO you should move your patch one line upper, i.e. before call to
_php_curl_cleanup_handle(ch); since error is rasing there.

I've also made some patches for this, could you review them and
comment what's wrong there, see them and discussion here:
http://markmail.org/message/yhywjpaiy3ttgfj5

There's also related bug with curl_multi part, see bug48203_multi.phpt
These tests fail for me now on trunk (it seems I forgot to add some of
them to other branches, please, consider trunk first):

FAILED TEST SUMMARY
-
Variation of bug #48203 with curl_multi_exec (Crash when file pointers
passed to curl are closed before calling curl_multi_exec)
[ext/curl/tests/bug48203_multi.phpt]
Bug #48203 (Crash when file pointers passed to curl are closed before
calling curl_exec) [ext/curl/tests/bug54798.phpt]
Memory corruption error if fp of just created file is closed before
curl_close. [ext/curl/tests/curl_file_deleted_before_curl_close.phpt]
curl_setopt basic tests with CURLOPT_STDERR.
[ext/curl/tests/curl_setopt_basic002.phpt]

Thanks.

2011/9/8 Hannes Magnusson bj...@php.net:
 bjori                                    Thu, 08 Sep 2011 14:37:18 +

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

 Log:
 Fixed bug#54798 Segfault when CURLOPT_STDERR file pointer is closed before 
 calling curl_exec

 Bug: https://bugs.php.net/54798 (Assigned) Segfault when CURLOPT_STDERR file 
 pointer is closed before calling curl_exec

 Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/curl/interface.c
    U   php/php-src/branches/PHP_5_3/ext/curl/tests/bug48203.phpt
    A   php/php-src/branches/PHP_5_3/ext/curl/tests/bug54798.phpt
    U   php/php-src/branches/PHP_5_4/ext/curl/interface.c
    U   php/php-src/branches/PHP_5_4/ext/curl/tests/bug48203.phpt
    A   php/php-src/branches/PHP_5_4/ext/curl/tests/bug54798.phpt
    U   php/php-src/trunk/ext/curl/interface.c
    U   php/php-src/trunk/ext/curl/tests/bug48203.phpt
    A   php/php-src/trunk/ext/curl/tests/bug54798.phpt


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




-- 
Regards,
Shein Alexey

--
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/tests/bug_36798.phpt branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt branches/PHP

2011-09-08 Thread Christopher Jones 
sixd Thu, 08 Sep 2011 20:13:32 +

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

Log:
Update SKIPIFs for test portability

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt
U   php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
U   php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
U   php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt
U   php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
U   php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
U   php/php-src/trunk/ext/pdo/tests/bug_36798.phpt
U   php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
U   php/php-src/trunk/ext/pdo_oci/tests/pdo_oci_stream_1.phpt

Modified: php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt   2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo/tests/bug_36798.phpt   2011-09-08 
20:13:32 UTC (rev 316427)
@@ -7,6 +7,12 @@
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
+
+}
+
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 ?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?
 --FILE--

Modified: php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_3/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 ?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?
 --FILE--

Modified: php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt   2011-09-08 
19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo/tests/bug_36798.phpt   2011-09-08 
20:13:32 UTC (rev 316427)
@@ -7,6 +7,12 @@
 if (false == $dir) die('skip no driver');
 require_once $dir . 'pdo_test.inc';
 PDOTest::skip();
+
+if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
+
+}
+
 ?
 --FILE--
 ?php

Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_fread_1.phpt 
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 ?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) 
die('skip expected output valid for WE8MSWIN1252 character set');
 PDOTest::skip();
 ?
 --FILE--

Modified: php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
2011-09-08 19:21:01 UTC (rev 316426)
+++ php/php-src/branches/PHP_5_4/ext/pdo_oci/tests/pdo_oci_stream_1.phpt
2011-09-08 20:13:32 UTC (rev 316427)
@@ -4,6 +4,7 @@
 ?php
 if (!extension_loaded('pdo') || !extension_loaded('pdo_oci')) die('skip not 
loaded');
 require(dirname(__FILE__).'/../../pdo/tests/pdo_test.inc');
+if (!strpos(strtolower(getenv('PDOTEST_DSN')),

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/spl/spl_directory.c branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt trunk/ext/spl/spl_directory.c trunk/ext/spl/tests/fileobject_003.phpt

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 23:07:48 +

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

Log:
- improve r316420 (SplFileObject cannot and should not accept directories)

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
U   php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt
U   php/php-src/trunk/ext/spl/spl_directory.c
U   php/php-src/trunk/ext/spl/tests/fileobject_003.phpt

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
22:05:33 UTC (rev 316432)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
23:07:48 UTC (rev 316433)
@@ -251,7 +251,18 @@

 static int spl_filesystem_file_open(spl_filesystem_object *intern, int 
use_include_path, int silent TSRMLS_DC) /* {{{ */
 {
+   zval  tmp;
+
intern-type = SPL_FS_FILE;
+
+   php_stat(intern-file_name, intern-file_name_len, FS_IS_DIR, tmp 
TSRMLS_CC);
+   if (Z_LVAL(tmp)) {
+   intern-u.file.open_mode = NULL;
+   intern-file_name = NULL;
+   zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
+   return;
+   }
+
intern-u.file.context = 
php_stream_context_from_zval(intern-u.file.zcontext, 0);
intern-u.file.stream = php_stream_open_wrapper_ex(intern-file_name, 
intern-u.file.open_mode, (use_include_path ? USE_PATH : 0) | REPORT_ERRORS, 
NULL, intern-u.file.context);

@@ -2254,7 +2265,7 @@
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
return;
}
-
+
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len = strlen(intern-u.file.stream-orig_path);


Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt  
2011-09-08 22:05:33 UTC (rev 316432)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/fileobject_003.phpt  
2011-09-08 23:07:48 UTC (rev 316433)
@@ -33,8 +33,12 @@
} catch (LogicException $e) {
echo LogicException: .$e-getMessage().\n;
}
-   $fo = $o-openFile();
-   var_dump($fo-getPathName(), $fo-getFileName(), $fo-getPath());
+   try {
+   $fo = $o-openFile();
+   var_dump($fo-getPathName(), $fo-getFileName(), 
$fo-getPath());
+   } catch (LogicException $e) {
+   echo LogicException: .$e-getMessage().\n;
+   }
 }

 test(dirname(__FILE__) . '/' . 'fileobject_001a.txt', 't', 
substr(dirname(__FILE__),-1));
@@ -88,9 +92,7 @@
 bool(true)
 bool(true)
 LogicException: Cannot use SplFileObject with directories
-string(%d) %stests
-string(%d) tests
-string(%d) %sspl
+LogicException: Cannot use SplFileObject with directories
 ===2===
 object(SplFileInfo)#%d (2) {
   [pathName:SplFileInfo:private]=
@@ -108,7 +110,5 @@
 bool(true)
 bool(true)
 LogicException: Cannot use SplFileObject with directories
-string(%d) %stests
-string(5) tests
-string(%d) %sspl
+LogicException: Cannot use SplFileObject with directories
 ===DONE===

Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c   2011-09-08 22:05:33 UTC (rev 
316432)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2011-09-08 23:07:48 UTC (rev 
316433)
@@ -251,7 +251,18 @@

 static int spl_filesystem_file_open(spl_filesystem_object *intern, int 
use_include_path, int silent TSRMLS_DC) /* {{{ */
 {
+   zval  tmp;
+
intern-type = SPL_FS_FILE;
+
+   php_stat(intern-file_name, intern-file_name_len, FS_IS_DIR, tmp 
TSRMLS_CC);
+   if (Z_LVAL(tmp)) {
+   intern-u.file.open_mode = NULL;
+   intern-file_name = NULL;
+   zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
+   return;
+   }
+
intern-u.file.context = 
php_stream_context_from_zval(intern-u.file.zcontext, 0);
intern-u.file.stream = php_stream_open_wrapper_ex(intern-file_name, 
intern-u.file.open_mode, (use_include_path ? USE_PATH : 0) | REPORT_ERRORS, 
NULL, intern-u.file.context);

@@ -2255,7 +2266,7 @@
zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
return;
}
-
+
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len = strlen(intern-u.file.stream-orig_path);


Modified: php/php-src/trunk/ext/spl/tests/fileobject_003.phpt

[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/spl/ spl_directory.c

2011-09-08 Thread Etienne Kneuss 
colder   Thu, 08 Sep 2011 23:10:40 +

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

Log:
MFH: adapt check for __construct bypass

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
23:07:48 UTC (rev 316433)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
23:10:40 UTC (rev 316434)
@@ -644,6 +644,7 @@
 * constructor or cleared its exception */

return (fsobj-u.dir.entry.d_name[0] != '\0' /* GlobIterator */ ||
+   fsobj-_path != NULL /* SplFileInfo */ ||
fsobj-orig_path != NULL /* Spl[Temp]FileObject */);
 }
 /* }}} */

-- 
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/spl/spl_directory.c trunk/ext/spl/spl_directory.c

2011-09-08 Thread Pierre Joye 
pajoye   Thu, 08 Sep 2011 23:12:32 +

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

Log:
- improve r316420 (SplFileObject cannot and should not accept directories)

Changed paths:
U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
U   php/php-src/trunk/ext/spl/spl_directory.c

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c
===
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
23:10:40 UTC (rev 316434)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.c2011-09-08 
23:12:32 UTC (rev 316435)
@@ -2257,16 +2257,6 @@
intern-u.file.open_mode_len = 1;
}

-   php_stat(intern-file_name, intern-file_name_len, FS_IS_DIR, tmp 
TSRMLS_CC);
-
-   if (Z_LVAL(tmp)) {
-   zend_restore_error_handling(error_handling TSRMLS_CC);
-   intern-u.file.open_mode = NULL;
-   intern-file_name = NULL;
-   zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
-   return;
-   }
-
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len = strlen(intern-u.file.stream-orig_path);


Modified: php/php-src/trunk/ext/spl/spl_directory.c
===
--- php/php-src/trunk/ext/spl/spl_directory.c   2011-09-08 23:10:40 UTC (rev 
316434)
+++ php/php-src/trunk/ext/spl/spl_directory.c   2011-09-08 23:12:32 UTC (rev 
316435)
@@ -2257,16 +2257,6 @@
intern-u.file.open_mode_len = 1;
}

-   php_stat(intern-file_name, intern-file_name_len, FS_IS_DIR, tmp 
TSRMLS_CC);
-
-   if (Z_LVAL(tmp)) {
-   zend_restore_error_handling(error_handling TSRMLS_CC);
-   intern-u.file.open_mode = NULL;
-   intern-file_name = NULL;
-   zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, 
Cannot use SplFileObject with directories);
-   return;
-   }
-
if (spl_filesystem_file_open(intern, use_include_path, 0 TSRMLS_CC) == 
SUCCESS) {
tmp_path_len = strlen(intern-u.file.stream-orig_path);


-- 
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/ NEWS

2011-09-08 Thread Etienne Kneuss 
colder   Thu, 08 Sep 2011 23:18:49 +

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

Log:
Mention recent SPL changes on spl_directory.c and tests

Changed paths:
U   php/php-src/branches/PHP_5_4/NEWS

Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS   2011-09-08 23:12:32 UTC (rev 316435)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-09-08 23:18:49 UTC (rev 316436)
@@ -48,7 +48,11 @@

 - Improved Session extension:
   . Expose session status via new function, session_status (FR #52982) (Arpad)
-
+
+- Improved SPL extension:
+  . Immediately reject wrong usages of directories under Spl(Temp)FileObject
+and friends. (Etienne, Pierre)
+
 - Improved XSL extension:
   . XSL doesn't stop transformation anymore, if a PHP function can't be called
 (Christian)

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