Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails

diff --cc ext/soap/tests/bugs/bug31422.phpt
index c4cf7e9f91b2614d824d4f29886da310781c5ed8,40e89730f88db997b4ee0164fbe2d36fb1e8a5a4..c8ddcfe092b42c79333a2e1bd6297ea964112fd8
--- 1/ext/soap/tests/bugs/bug31422.phpt
--- 2/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) {