Merge branch 'master' into preload

dstogov · dstogov · commit 36b644fbb738 · 2018-11-01T10:56:02.000+03:00
* master:
  Fix stray newline that caused this test to fail
  Fix session tests that fail if error_log is set
  This test needs to log to stdout
  Fix error condition
  Fixed bug #77081 ftruncate() changes seek pointer in c mode
  Fix and improve test case
diff --git a/ext/session/tests/bug60860.phpt b/ext/session/tests/bug60860.phpt
@@ -7,6 +7,7 @@ include('skipif.inc');
 --INI--
 session.save_handler=user
 display_errors=off
+error_log=
 --FILE--
 <?php
 
diff --git a/ext/session/tests/bug66481.phpt b/ext/session/tests/bug66481.phpt
@@ -2,6 +2,7 @@
 Bug #66481: Calls to session_name() segfault when session.name is null.
 --INI--
 session.name=
+error_log=
 --SKIPIF--
 <?php include('skipif.inc'); ?>
 --FILE--
diff --git a/ext/session/tests/session_set_save_handler_class_014.phpt b/ext/session/tests/session_set_save_handler_class_014.phpt
@@ -4,6 +4,7 @@ Test session_set_save_handler() : calling default handler when save_handler=user
 session.save_handler=user
 session.name=PHPSESSID
 display_errors=off
+error_log=
 --SKIPIF--
 <?php
 include('skipif.inc');
diff --git a/ext/standard/tests/file/ftruncate_bug77081.phpt b/ext/standard/tests/file/ftruncate_bug77081.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #77081 ftruncate() changes seek pointer in c mode
+--FILE--
+<?php
+
+$filename = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test77081";
+
+file_put_contents($filename, 'foo');
+$stream = fopen($filename, 'c');
+ftruncate($stream, 0);
+var_dump(ftell($stream));
+fwrite($stream, 'bar');
+fclose($stream);
+var_dump(file_get_contents($filename));
+
+?>
+--CLEAN--
+<?php
+$fn = dirname(__FILE__) . DIRECTORY_SEPARATOR . "test77081";
+unlink($fn);
+?>
+--EXPECT--
+int(0)
+string(3) "bar"
diff --git a/ext/xml/tests/bug71592.phpt b/ext/xml/tests/bug71592.phpt
@@ -6,9 +6,11 @@ if (!extension_loaded('xml')) die('skip xml extension not available');
 ?>
 --FILE--
 <?php
+// The tag mismatch at the end of the XML is on purpose, to make sure that the
+// parser actually stops after the handler returns FALSE.
 $xml = <<<XML
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE p [
+<!DOCTYPE root [
   <!ENTITY pic PUBLIC "image.gif" "http://example.org/image.gif">
 ]>
 <root>
@@ -22,9 +24,9 @@ xml_set_external_entity_ref_handler($parser, function () {
     return false;
 });
 xml_parse($parser, $xml);
-var_dump(xml_get_error_code($parser));
+var_dump(xml_get_error_code($parser) === XML_ERROR_EXTERNAL_ENTITY_HANDLING);
 ?>
 ===DONE===
 --EXPECT--
-int(21)
+bool(true)
 ===DONE===
diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c
@@ -858,26 +858,27 @@ static int php_stdiop_set_option(php_stream *stream, int option, int value, void
 						return PHP_STREAM_OPTION_RETURN_ERR;
 					}
 
-					LARGE_INTEGER old_sz;
-					if (!GetFileSizeEx(h, &old_sz)) {
+					LARGE_INTEGER sz, old_sz;
+					sz.QuadPart = 0;
+
+					if (!SetFilePointerEx(h, sz, &old_sz, FILE_CURRENT)) {
 						return PHP_STREAM_OPTION_RETURN_ERR;
 					}
 
-					LARGE_INTEGER sz;
 #if defined(_WIN64)
 					sz.HighPart = (new_size >> 32);
 					sz.LowPart = (new_size & 0xffffffff);
 #else
 					sz.HighPart = 0;
 					sz.LowPart = new_size;
 #endif
-					if (INVALID_SET_FILE_POINTER == SetFilePointerEx(h, sz, NULL, FILE_BEGIN) && NO_ERROR != GetLastError()) {
+					if (!SetFilePointerEx(h, sz, NULL, FILE_BEGIN)) {
 						return PHP_STREAM_OPTION_RETURN_ERR;
 					}
 					if (0 == SetEndOfFile(h)) {
 						return PHP_STREAM_OPTION_RETURN_ERR;
 					}
-					if (INVALID_SET_FILE_POINTER == SetFilePointerEx(h, old_sz, NULL, FILE_BEGIN) && NO_ERROR != GetLastError()) {
+					if (!SetFilePointerEx(h, old_sz, NULL, FILE_BEGIN)) {
 						return PHP_STREAM_OPTION_RETURN_ERR;
 					}
 					return PHP_STREAM_OPTION_RETURN_OK;
diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
@@ -78,7 +78,6 @@ fclose($fp);
 Done
 --EXPECTF--
 Test
-
 HTTP/1.1 200 OK
 Host: %s
 Date: %s
diff --git a/tests/run-test/bug75042-3.phpt b/tests/run-test/bug75042-3.phpt
@@ -1,5 +1,9 @@
 --TEST--
 phpt EXTENSIONS directive with nonexistent shared module
+--INI--
+error_log=
+display_startup_errors=1
+display_errors=1
 --EXTENSIONS--
 nonexistentsharedmodule
 --FILE--
