From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 7 Oct 2019 07:18:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0RC4~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b142e8a4b3e82c49600edc3469d09b4febb889ee;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78623: Regression caused by "SP call yields additional empty result set"
---

b142e8a4b3e82c49600edc3469d09b4febb889ee
diff --cc NEWS
index 4651faeb42,e230cd21f2..e96d2f4d43
--- a/NEWS
+++ b/NEWS
@@@ -1,41 -1,19 +1,45 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.11
 +?? ??? ????, PHP 7.4.0RC4
  
  - Core:
 -  . Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
 -    (bugreportuser)
 +  . Fixed bug #78614 (Does not compile with DTRACE anymore).
 +    (tz at FreeBSD dot org)
    . Fixed bug #78620 (Out of memory error). (cmb, Nikita)
 +  . Fixed bug #78632 (method_exists() in php74 works differently from php73 in
 +    checking priv. methods). (Nikita)
  
 -- Exif :
 -  . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
 -	(Kalle)
 +- Pcntl:
 +  . Fixed bug #77335 (PHP is preventing SIGALRM from specifying SA_RESTART).
 +    (Nikita)
  
 -- FPM:
 -  . Fixed bug #78413 (request_terminate_timeout does not take effect after
 -    fastcgi_finish_request). (Sergei Turchanov)
 +- MySQLi:
 +  . Fixed bug #76809 (SSL settings aren't respected when persistent connections 
 +    are used). (fabiomsouto)
 +
++- PDO_MySQL:
++  . Fixed bug #78623 (Regression caused by "SP call yields additional empty
++    result set"). (cmb)
++
 +- SimpleXML:
 +  . Fixed bug #75245 (Don't set content of elements with only whitespaces). 
 +    (eriklundin)
 +
 +- Standard:
 +  . Fixed bug #76859 (stream_get_line skips data if used with data-generating 
 +    filter). (kkopachev)
 +
 +03 Oct 2019, PHP 7.4.0RC3
 +
 +- Core:
 +  . Fixed bug #78604 (token_get_all() does not properly tokenize FOO<?php with
 +    short_open_tag=0). (Nikita)
 +
 +- FFI:
 +  . Fixed bug #78543 (is_callable() on FFI\CData throws Exception). (cmb)
 +
 +- GMP:
 +  . Fixed bug #78574 (broken shared build). (Remi)
  
  - MBString:
    . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency).
diff --cc ext/pdo_mysql/tests/bug_39858.phpt
index 8b073997e1,ec4c9586cc..db8afa99b8
--- a/ext/pdo_mysql/tests/bug_39858.phpt
+++ b/ext/pdo_mysql/tests/bug_39858.phpt
@@@ -13,14 -13,16 +13,16 @@@ $matches = array()
  if (!preg_match('/^(\d+)\.(\d+)\.(\d+)/ismU', $row['_version'], $matches))
  	die(sprintf("skip Cannot determine MySQL Server version\n"));
  
 -$version = $matches[0] * 10000 + $matches[1] * 100 + $matches[2];
 +$version = $matches[1] * 10000 + $matches[2] * 100 + $matches[3];
  if ($version < 50000)
  	die(sprintf("skip Need MySQL Server 5.0.0+, found %d.%02d.%02d (%d)\n",
 -		$matches[0], $matches[1], $matches[2], $version));
 +		$matches[1], $matches[2], $matches[3], $version));
  ?>
+ --XFAIL--
+ nextRowset() problem with stored proc & emulation mode & mysqlnd
  --FILE--
  <?php
 -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
  $db = MySQLPDOTest::factory();
  $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
  
diff --cc ext/pdo_mysql/tests/bug_41997.phpt
index bf0350d7c1,3a90244365..e3b52944be
--- a/ext/pdo_mysql/tests/bug_41997.phpt
+++ b/ext/pdo_mysql/tests/bug_41997.phpt
@@@ -1,9 -1,11 +1,11 @@@
  --TEST--
  PDO MySQL Bug #41997 (stored procedure call returning single rowset blocks future queries)
+ --XFAIL--
+ nextRowset() problem with stored proc & emulation mode & mysqlnd
  --SKIPIF--
  <?php
 -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
  MySQLPDOTest::skip();
  
  $db = MySQLPDOTest::factory();
diff --cc ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
index 07fae1c672,02f8c682b2..63a500b7b3
--- a/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
+++ b/ext/pdo_mysql/tests/pdo_mysql_stmt_variable_columncount.phpt
@@@ -1,9 -1,11 +1,11 @@@
  --TEST--
  MySQL Prepared Statements and different column counts
+ --XFAIL--
+ nextRowset() problem with stored proc & emulation mode & mysqlnd
  --SKIPIF--
  <?php
 -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
 -require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
 +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
 +require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
  MySQLPDOTest::skip();
  $db = MySQLPDOTest::factory();