Commit:    2e9eb5e32fb489d73cb336730104d507b20d9652
Author:    Xinchen Hui <larue...@php.net>         Sat, 21 Apr 2012 16:02:25 
+0800
Parents:   dd34fe52b93dd48b9667dd75f07d0a48681c3dca
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=2e9eb5e32fb489d73cb336730104d507b20d9652

Log:
Fix test

Reported by cjones

Changed paths:
  M  ext/standard/tests/streams/bug60106.phpt


Diff:
diff --git a/ext/standard/tests/streams/bug60106.phpt 
b/ext/standard/tests/streams/bug60106.phpt
index f96c5b4..1b36af1 100644
--- a/ext/standard/tests/streams/bug60106.phpt
+++ b/ext/standard/tests/streams/bug60106.phpt
@@ -7,12 +7,17 @@ if( substr(PHP_OS, 0, 3) == "WIN" )
 ?>
 --FILE--
 <?php
-       error_reporting(E_ALL | E_NOTICE);
-       stream_socket_server("unix:///tmp/" . str_repeat("a", 512));
+error_reporting(E_ALL | E_NOTICE);
+$socket_file = "/tmp/" . str_repeat("a", 512);
+function get_truncated_socket_filename($errno, $errmsg, $file, $line) {
+    global $socket_file;
+    print_r ($errmsg);
+    preg_match("#maximum allowed length of (\d+) bytes#", $errmsg, $matches);
+    $socket_file = substr($socket_file, 0, intval($matches[1]) - 1);
+}
+set_error_handler("get_truncated_socket_filename", E_NOTICE);
+stream_socket_server("unix://" . $socket_file);
+unlink($socket_file);
 ?>
-===DONE===
 --EXPECTF--
-Notice: stream_socket_server(): socket path exceeded the maximum allowed 
length of %d bytes and was truncated in %sbug60106.php on line %d
-
-Warning: stream_socket_server(): unable to connect to 
unix:///tmp/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 (Unknown error) in %sbug60106.php on line %d
-===DONE===
+stream_socket_server(): socket path exceeded the maximum allowed length of %d 
bytes and was truncated


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

Reply via email to