com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/tests/bugs/bug31422.phpt

Commit: 4ac6862fc461ff475994a2c3f001cde353034ca3 Author: Anatoliy Belsky <ab@php.net> Mon, 16 Apr 2012 15:40:10 +0200 Parents: 5d1565088fe57c7d0dc711e7a1271bc7c8bd948a 9c8907ec10aa7af751c9717293c707fe717831e4 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ac6862fc461ff475994a2c3f001cde353034ca3 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails Bugs: https://bugs.php.net/61719 https://bugs.php.net/31422 Changed paths: MM ext/soap/tests/bugs/bug31422.phpt Diff: diff --cc ext/soap/tests/bugs/bug31422.phpt index c4cf7e9,40e8973..c8ddcfe --- a/ext/soap/tests/bugs/bug31422.phpt +++ b/ext/soap/tests/bugs/bug31422.phpt @@@ -1,10 -1,14 +1,15 @@@ --TEST-- Bug #31422 (No Error-Logging on SoapServer-Side) --SKIPIF-- - <?php require_once('skipif.inc'); ?> + <?php + if (substr(PHP_OS, 0, 3) == 'WIN') { + die('skip not valid for windows'); + } + require_once('skipif.inc'); + ?> --INI-- log_errors=1 +error_log= --FILE-- <?php function Add($x,$y) {