sixd Mon, 06 Feb 2012 23:31:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=323103
Log:
Mask different curl message. Now passes on Oracle Linux 5
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52820.phpt
U php/php-src/trunk/ext/standard/tests/file/bug52820.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
2012-02-06 23:14:47 UTC (rev 323102)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/file/bug52820.phpt
2012-02-06 23:31:51 UTC (rev 323103)
@@ -31,17 +31,17 @@
fclose(do_stuff("php://memory"));
echo "\nDone.\n";
---EXPECT--
+--EXPECTF--
temp stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
memory stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52820.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52820.phpt
2012-02-06 23:14:47 UTC (rev 323102)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug52820.phpt
2012-02-06 23:31:51 UTC (rev 323103)
@@ -39,31 +39,31 @@
leak_variable(do_stuff("php://memory"), true);
echo "\nDone.\n";
---EXPECT--
+--EXPECTF--
temp stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
memory stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
temp stream (leak):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
memory stream (leak):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
Modified: php/php-src/trunk/ext/standard/tests/file/bug52820.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/file/bug52820.phpt 2012-02-06
23:14:47 UTC (rev 323102)
+++ php/php-src/trunk/ext/standard/tests/file/bug52820.phpt 2012-02-06
23:31:51 UTC (rev 323103)
@@ -39,31 +39,31 @@
leak_variable(do_stuff("php://memory"), true);
echo "\nDone.\n";
---EXPECT--
+--EXPECTF--
temp stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
memory stream (close after):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
temp stream (leak):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
memory stream (leak):
About to rewind!
-* About to connect() to 127.0.0.1 port 37349 (#0)
+* About to connect() to 127.0.0.1 port 37349%r.*%r
* Trying 127.0.0.1... * Connection refused
* couldn't connect to host
* Closing connection #0
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
