diff options
| author | Anatoliy Belsky <ab@php.net> | 2012-07-09 18:51:27 +0200 |
|---|---|---|
| committer | Anatoliy Belsky <ab@php.net> | 2012-07-09 18:51:27 +0200 |
| commit | 64604350f53d6d3bc8c95e1b229a95b12a396291 (patch) | |
| tree | ed8f5d0e7f3589b974fd244d10d76f1f4ed0cbc2 | |
| parent | 049abdfb2635f4f05bb4c51eccc246ffcdfa0dfe (diff) | |
| parent | 97b8798520533f062a5c5c422d79cd84526312ce (diff) | |
| download | php-git-64604350f53d6d3bc8c95e1b229a95b12a396291.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed test bug #62312 (warnings changed one more time)
fix valgrind warning
Conflicts:
ext/mysqlnd/mysqlnd.c
| -rw-r--r-- | ext/sockets/tests/socket_import_stream-4-win.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/sockets/tests/socket_import_stream-4-win.phpt b/ext/sockets/tests/socket_import_stream-4-win.phpt index 68b6582b83..e2fc523ce5 100644 --- a/ext/sockets/tests/socket_import_stream-4-win.phpt +++ b/ext/sockets/tests/socket_import_stream-4-win.phpt @@ -83,11 +83,11 @@ socket_set_block Warning: socket_set_block(): An operation was attempted on something that is not a socket. in %ssocket_import_stream-4-win.php on line %d -Warning: socket_set_block(): unable to set blocking mode [0]: The operation completed successfully. +Warning: socket_set_block(): unable to set blocking mode [%d]: An operation was attempted on something that is not a socket. in %ssocket_import_stream-4-win.php on line %d socket_get_option -Warning: socket_get_option(): unable to retrieve socket option [0]: An operation was attempted on something that is not a socket. +Warning: socket_get_option(): unable to retrieve socket option [%d]: An operation was attempted on something that is not a socket. in %ssocket_import_stream-4-win.php on line %d |