diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-12-21 12:24:52 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-12-21 12:24:52 -0500 |
| commit | 59a4514dc0e8950ce210036332cc64c414fdcc22 (patch) | |
| tree | 191713b901805f743e00f11414305c7d510bae09 | |
| parent | 763bce0303b3afd19d109d96c37d6d33a899e990 (diff) | |
| parent | 63659ce52678500ec024f1146ebf30e70624b935 (diff) | |
| download | php-git-59a4514dc0e8950ce210036332cc64c414fdcc22.tar.gz | |
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
| -rw-r--r-- | ext/standard/tests/file/bug52820.phpt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt index 8a1e7cc981..91976b04db 100644 --- a/ext/standard/tests/file/bug52820.phpt +++ b/ext/standard/tests/file/bug52820.phpt @@ -43,29 +43,29 @@ echo "\nDone.\n"; temp 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
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.
|