From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 12 Jan 2017 20:14:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da5e09ad0389f53cdc78591442a3df1ff54c6ff0;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

da5e09ad0389f53cdc78591442a3df1ff54c6ff0
diff --cc NEWS
index dee7ca9513,efbee5e717..05e3d9e774
--- a/NEWS
+++ b/NEWS
@@@ -1,19 -1,21 +1,23 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.16
 +?? ??? 2017, PHP 7.1.2
  
  - Core:
 +  . Improved GENERATOR_CREATE opcode handler. (Bob, Dmitry)
 +  . Fixed bug #73877 (readlink() returns garbage for UTF-8 paths). (Anatol)
    . Fixed bug #73876 (Crash when exporting **= in expansion of assign op).
 -  (Sara)
 +    (Sara)
  
 -- FPM:
 -  . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
 -    (Dmitry Saprykin)
 +- FCGI:
 +  . Fixed bug #73904 (php-cgi fails to load -c specified php.ini file). (Anatol)
  
+ - Mysqlnd:
+   . Fixed bug #69899 (segfault on close() after free_result() with mysqlnd).
+     (Richard Fussenegger)
+ 
  - OpenSSL:
    . Fixed bug #71519 (add serial hex to return value array). (xrobau)
 +  . Fixed bug #73692 (Compile ext/openssl with openssl 1.1.0 on Win). (Anatol)
  
  - PDO_Firebird:
    . Implemented FR #72583 (All data are fetched as strings). (Dorin Marcoci)
diff --cc ext/mysqlnd/mysqlnd_ps.c
index c805e6f111,2631e4a797..256bbe4d47
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@@ -2032,8 -2005,9 +2032,9 @@@ MYSQLND_METHOD(mysqlnd_stmt, free_resul
  		stmt->state = MYSQLND_STMT_PREPARED;
  	}
  
- 	/* Line is free! */
- 	SET_CONNECTION_STATE(&conn->state, CONN_READY);
 -	if (CONN_GET_STATE(stmt->conn) != CONN_QUIT_SENT) {
 -		CONN_SET_STATE(stmt->conn, CONN_READY);
++	if (GET_CONNECTION_STATE(&conn->state) != CONN_QUIT_SENT) {
++		SET_CONNECTION_STATE(&conn->state, CONN_READY);
+ 	}
  
  	DBG_RETURN(PASS);
  }