Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

faizshukri · faizshukri · commit ae9ba081c8c8 · 2012-12-19T15:08:09.000+01:00
diff --git a/ext/sockets/tests/bug49341.phpt b/ext/sockets/tests/bug49341.phpt
@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {
     die('skip sockets extension not available.');
 }
 if (PHP_OS !== 'Darwin' && false === strpos(PHP_OS, 'BSD')) {
-    die('is not *BSD.');
+    die('skip is not *BSD.');
 }
 --FILE--
 <?php

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ if (!extension_loaded('sockets')) {`
`6`	`6`	`die('skip sockets extension not available.');`
`7`	`7`	`}`
`8`	`8`	`if (PHP_OS !== 'Darwin' && false === strpos(PHP_OS, 'BSD')) {`
`9`		`- die('is not *BSD.');`
	`9`	`+ die('skip is not *BSD.');`
`10`	`10`	`}`
`11`	`11`	`--FILE--`
`12`	`12`	`<?php`