Merge branch 'PHP-7.1'

14 files changed, 4 insertions, 180 deletions

diff --git a/ext/session/tests/bug60860-win32.phpt b/ext/session/tests/bug60860-win32.phpt
deleted file mode 100644
index a3e32a9988..0000000000
--- a/ext/session/tests/bug60860-win32.phpt
+++ /dev/null
@@ -1,23 +0,0 @@
---TEST--
-Bug #60860 (session.save_handler=user without defined function core dumps)
---SKIPIF--
-<?php
-include('skipif.inc');
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip only for Windows');
-}
-?>
---INI--
-session.save_handler=user
-display_errors=off
---FILE--
-<?php
-
-session_start();
-echo "ok\n";
-
-?>
---EXPECTF--
-ok
-PHP Recoverable fatal error:  PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
-
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
index a9c7507b31..38a3796b68 100644
--- a/ext/session/tests/bug60860.phpt
+++ b/ext/session/tests/bug60860.phpt
@@ -3,9 +3,6 @@ Bug #60860 (session.save_handler=user without defined function core dumps)
 --SKIPIF--
 <?php
 include('skipif.inc');
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip not for Windows');
-}
 ?>
 --INI--
 session.save_handler=user
diff --git a/ext/session/tests/bug66481-win32.phpt b/ext/session/tests/bug66481-win32.phpt
deleted file mode 100644
index 1c597b5604..0000000000
--- a/ext/session/tests/bug66481-win32.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-Bug #66481: Calls to session_name() segfault when session.name is null, Windows.
---INI--
-session.name=
---SKIPIF--
-<?php include('skipif.inc'); ?>
-<?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows only"); ?>
---FILE--
-<?php
-ob_start();
-
-var_dump(session_name("foo"));
-var_dump(session_name("bar"));
-?>
---EXPECTF--
-Warning: PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
-string(9) "PHPSESSID"
-string(3) "foo"
-PHP Warning:  PHP Startup: session.name cannot be a numeric or empty '' in Unknown on line 0
diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt
index 280c0b2420..c75cb88d1c 100644
--- a/ext/session/tests/bug66481.phpt
+++ b/ext/session/tests/bug66481.phpt
@@ -4,7 +4,6 @@ Bug #66481: Calls to session_name() segfault when session.name is null.
 session.name=
 --SKIPIF--
 <?php include('skipif.inc'); ?>
-<?php if(substr(PHP_OS, 0, 3) == "WIN") die("skip Not for Windows"); ?>
 --FILE--
 <?php
 ob_start();
diff --git a/ext/session/tests/rfc1867_invalid_settings-win.phpt b/ext/session/tests/rfc1867_invalid_settings-win.phpt
deleted file mode 100644
index ed854e8898..0000000000
--- a/ext/session/tests/rfc1867_invalid_settings-win.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-session rfc1867 invalid settings
---INI--
-session.upload_progress.freq=-1
-error_log=
---SKIPIF--
-<?php 
-include('skipif.inc');
-if(substr(PHP_OS, 0, 3) != "WIN")
-        die("skip windows only test");
-?>
---FILE--
-<?php
-var_dump(ini_get("session.upload_progress.freq"));
-?>
---EXPECTF--
-Warning: PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
-string(2) "1%"
-PHP Warning:  PHP Startup: session.upload_progress.freq must be greater than or equal to zero in %s
diff --git a/ext/session/tests/rfc1867_invalid_settings.phpt b/ext/session/tests/rfc1867_invalid_settings.phpt
index 640c4d2436..1a989e979b 100644
--- a/ext/session/tests/rfc1867_invalid_settings.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings.phpt
@@ -6,8 +6,6 @@ error_log=
 --SKIPIF--
 <?php 
 include('skipif.inc');
-if(substr(PHP_OS, 0, 3) == "WIN")
-        die("skip Not for Windows");
 ?>
 --FILE--
 <?php
diff --git a/ext/session/tests/rfc1867_invalid_settings_2-win.phpt b/ext/session/tests/rfc1867_invalid_settings_2-win.phpt
deleted file mode 100644
index f8e6b6d208..0000000000
--- a/ext/session/tests/rfc1867_invalid_settings_2-win.phpt
+++ /dev/null
@@ -1,19 +0,0 @@
---TEST--
-session rfc1867 invalid settings 2
---INI--
-session.upload_progress.freq=200%
-error_log=
---SKIPIF--
-<?php 
-include('skipif.inc');
-if(substr(PHP_OS, 0, 3) != "WIN")
-        die("skip windows only test");
-?>
---FILE--
-<?php
-var_dump(ini_get("session.upload_progress.freq"));
-?>
---EXPECTF--
-Warning: PHP Startup: session.upload_progress.freq cannot be over 100% in %s
-string(2) "1%"
-PHP Warning:  PHP Startup: session.upload_progress.freq cannot be over 100% in %s
diff --git a/ext/session/tests/rfc1867_invalid_settings_2.phpt b/ext/session/tests/rfc1867_invalid_settings_2.phpt
index c2a0c6ac4e..9246e1dbbc 100644
--- a/ext/session/tests/rfc1867_invalid_settings_2.phpt
+++ b/ext/session/tests/rfc1867_invalid_settings_2.phpt
@@ -6,8 +6,6 @@ error_log=
 --SKIPIF--
 <?php 
 include('skipif.inc');
-if(substr(PHP_OS, 0, 3) == "WIN")
-        die("skip Not for Windows");
 ?>
 --FILE--
 <?php
diff --git a/ext/session/tests/session_set_save_handler_class_014-win32.phpt b/ext/session/tests/session_set_save_handler_class_014-win32.phpt
deleted file mode 100644
index f26a9fa098..0000000000
--- a/ext/session/tests/session_set_save_handler_class_014-win32.phpt
+++ /dev/null
@@ -1,36 +0,0 @@
---TEST--
-Test session_set_save_handler() : calling default handler when save_handler=user
---INI--
-session.save_handler=user
-session.name=PHPSESSID
-display_errors=off
---SKIPIF--
-<?php
-include('skipif.inc');
-if (substr(PHP_OS, 0, 3) != 'WIN') {
-    die('skip only for Windows');
-}
-?>
---FILE--
-<?php
-
-ob_start();
-
-/* 
- * Prototype : bool session_set_save_handler(SessionHandler $handler [, bool $register_shutdown_function = true])
- * Description : Sets user-level session storage functions
- * Source code : ext/session/session.c 
- */
-
-echo "*** Testing session_set_save_handler() : calling default handler when save_handler=user ***\n";
-
-$oldHandler = ini_get('session.save_handler');
-$handler = new SessionHandler;
-session_set_save_handler($handler);
-
-session_start();
-
---EXPECTF--
-*** Testing session_set_save_handler() : calling default handler when save_handler=user ***
-PHP Recoverable fatal error:  PHP Startup: Cannot set 'user' save handler by ini_set() or session_module_name() in Unknown on line 0
-
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
index 1b06cd0b64..ba689cef02 100644
--- a/ext/session/tests/session_set_save_handler_class_014.phpt
+++ b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -7,9 +7,6 @@ display_errors=off
 --SKIPIF--
 <?php
 include('skipif.inc');
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip not for Windows');
-}
 ?>
 --FILE--
 <?php
diff --git a/ext/soap/tests/bugs/bug31422-win.phpt b/ext/soap/tests/bugs/bug31422-win.phpt
deleted file mode 100644
index ba8df0726c..0000000000
--- a/ext/soap/tests/bugs/bug31422-win.phpt
+++ /dev/null
@@ -1,47 +0,0 @@
---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 c8ddcfe092..4889b10d8e 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -2,9 +2,6 @@
 Bug #31422 (No Error-Logging on SoapServer-Side)
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    die('skip not valid for windows');
-}
 require_once('skipif.inc');
 ?>
 --INI--
diff --git a/main/main.c b/main/main.c
index 193d88bc44..361b356d44 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1159,11 +1159,9 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u
 					if ((!strcmp(sapi_module.name, "cli") || !strcmp(sapi_module.name, "cgi")) &&
 						PG(display_errors) == PHP_DISPLAY_ERRORS_STDERR
 					) {
-#ifdef PHP_WIN32
 						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);
+#ifdef PHP_WIN32
 						fflush(stderr);
-#else
-						fprintf(stderr, "%s: %s in %s on line %u\n", error_type_str, buffer, error_filename, error_lineno);
 #endif
 					} else {
 						php_printf("%s\n%s: %s in %s on line %d\n%s", STR_PRINT(prepend_string), error_type_str, buffer, error_filename, error_lineno, STR_PRINT(append_string));
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index b5fa6ea989..0c34afaac4 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -384,6 +384,9 @@ static void sapi_cli_register_variables(zval *track_vars_array) /* {{{ */
 static void sapi_cli_log_message(char *message, int syslog_type_int) /* {{{ */
 {
 	fprintf(stderr, "%s\n", message);
+#ifdef PHP_WIN32
+	fflush(stderr);
+#endif
 }
 /* }}} */