tyrael Sat, 22 Oct 2011 21:44:05 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=318326
Advertising
Log:
stream_socket_server("unix://..." has a length limit, so it is better to use
the tmp dir instead of the current test dir for the socket file. see
https://bugs.php.net/bug.php?id=60106
Changed paths:
U php/php-src/branches/PHP_5_3/sapi/cli/tests/022.phpt
U php/php-src/branches/PHP_5_4/sapi/cli/tests/022.phpt
U php/php-src/trunk/sapi/cli/tests/022.phpt
Modified: php/php-src/branches/PHP_5_3/sapi/cli/tests/022.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/sapi/cli/tests/022.phpt 2011-10-22
20:30:04 UTC (rev 318325)
+++ php/php-src/branches/PHP_5_3/sapi/cli/tests/022.phpt 2011-10-22
21:44:05 UTC (rev 318326)
@@ -8,7 +8,7 @@
--FILE--
<?php
$php = getenv("TEST_PHP_EXECUTABLE");
-$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
+$socket_file = tempnam(sys_get_temp_dir(), pathinfo(__FILE__,
PATHINFO_FILENAME) . '.sock');
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
Modified: php/php-src/branches/PHP_5_4/sapi/cli/tests/022.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/tests/022.phpt 2011-10-22
20:30:04 UTC (rev 318325)
+++ php/php-src/branches/PHP_5_4/sapi/cli/tests/022.phpt 2011-10-22
21:44:05 UTC (rev 318326)
@@ -8,7 +8,7 @@
--FILE--
<?php
$php = getenv("TEST_PHP_EXECUTABLE");
-$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
+$socket_file = tempnam(sys_get_temp_dir(), pathinfo(__FILE__,
PATHINFO_FILENAME) . '.sock');
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
Modified: php/php-src/trunk/sapi/cli/tests/022.phpt
===================================================================
--- php/php-src/trunk/sapi/cli/tests/022.phpt 2011-10-22 20:30:04 UTC (rev
318325)
+++ php/php-src/trunk/sapi/cli/tests/022.phpt 2011-10-22 21:44:05 UTC (rev
318326)
@@ -8,7 +8,7 @@
--FILE--
<?php
$php = getenv("TEST_PHP_EXECUTABLE");
-$socket_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME)
. '.sock';
+$socket_file = tempnam(sys_get_temp_dir(), pathinfo(__FILE__,
PATHINFO_FILENAME) . '.sock');
$test_file = dirname(__FILE__) . '/' . pathinfo(__FILE__, PATHINFO_FILENAME) .
'.inc';
if (file_exists($socket_file)) {
unlink($socket_file);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
