Commit: 59a4514dc0e8950ce210036332cc64c414fdcc22 Author: Pierrick Charron <pierr...@php.net> Fri, 21 Dec 2012 12:24:52 -0500 Parents: 763bce0303b3afd19d109d96c37d6d33a899e990 63659ce52678500ec024f1146ebf30e70624b935 Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59a4514dc0e8950ce210036332cc64c414fdcc22 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix test to work on every libcurl version - Fixed typo on "SKIPIF" (causing make test to abort on some systems) Conflicts: tests/output/bug63377.phpt Bugs: https://bugs.php.net/63377 Changed paths: MM ext/standard/tests/file/bug52820.phpt Diff: diff --cc ext/standard/tests/file/bug52820.phpt index 8a1e7cc,19d0e9e..91976b0 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@@ -50,22 -42,8 +50,22 @@@ About to rewind memory stream (close after): About to rewind! * About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host + * Trying 127.0.0.1...%A* Connection refused + * couldn't connect to host%S * Closing connection #0 +temp stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + +memory stream (leak): +About to rewind! +* About to connect() to 127.0.0.1 port 37349%r.*%r - * Trying 127.0.0.1... * Connection refused - * couldn't connect to host ++* Trying 127.0.0.1...%A* Connection refused ++* couldn't connect to host%S +* Closing connection #0 + Done. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
