From eaeeb0f5e88c7e68c6fc44abb597af10e7b925d7 Mon Sep 17 00:00:00 2001
From: Anatoliy Belsky <ab@php.net>
Date: Mon, 16 Apr 2012 15:35:47 +0200
Subject: [PATCH] Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails

---
 ext/soap/tests/bugs/bug31422-win.phpt | 47 +++++++++++++++++++++++++++
 ext/soap/tests/bugs/bug31422.phpt     |  7 +++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 ext/soap/tests/bugs/bug31422-win.phpt

diff --git a/ext/soap/tests/bugs/bug31422-win.phpt b/ext/soap/tests/bugs/bug31422-win.phpt
new file mode 100644
index 0000000000..ba8df0726c
--- /dev/null
+++ b/ext/soap/tests/bugs/bug31422-win.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #31422 (No Error-Logging on SoapServer-Side)
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) != 'WIN') {
+    die('skip not valid for non windows');
+}
+require_once('skipif.inc');
+?>
+--INI--
+log_errors=1
+--FILE--
+<?php
+function Add($x,$y) {
+	fopen();
+	user_error("Hello", E_USER_ERROR);
+  return $x+$y;
+}
+
+$server = new SoapServer(null,array('uri'=>"http://testuri.org"));
+$server->addfunction("Add");
+
+$HTTP_RAW_POST_DATA = <<<EOF
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<SOAP-ENV:Envelope
+  SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:si="http://soapinterop.org/xsd">
+  <SOAP-ENV:Body>
+    <ns1:Add xmlns:ns1="http://testuri.org">
+      <x xsi:type="xsd:int">22</x>
+      <y xsi:type="xsd:int">33</y>
+    </ns1:Add>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>
+EOF;
+
+$server->handle($HTTP_RAW_POST_DATA);
+echo "ok\n";
+?>
+--EXPECTF--
+<?xml version="1.0" encoding="UTF-8"?>
+<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"><SOAP-ENV:Body><SOAP-ENV:Fault><faultcode>SOAP-ENV:Server</faultcode><faultstring>Hello</faultstring></SOAP-ENV:Fault></SOAP-ENV:Body></SOAP-ENV:Envelope>
+PHP Warning:  fopen() expects at least 2 parameters, 0 given in %sbug31422-win.php on line %d
+PHP Fatal error:  Hello in %sbug31422-win.php on line %d
diff --git a/ext/soap/tests/bugs/bug31422.phpt b/ext/soap/tests/bugs/bug31422.phpt
index c4cf7e9f91..c8ddcfe092 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -1,7 +1,12 @@
 --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=
-- 
2.50.1