From: Anatoliy Belsky <ab@php.net>
Date: Mon, 16 Apr 2012 13:40:10 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~112
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ac6862fc461ff475994a2c3f001cde353034ca3;p=php

Merge branch 'PHP-5.3' into PHP-5.4

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

4ac6862fc461ff475994a2c3f001cde353034ca3
diff --cc ext/soap/tests/bugs/bug31422.phpt
index c4cf7e9f91,40e89730f8..c8ddcfe092
--- 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) {