Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 7f2fba21eb5926005e596e2dce7f68c418b13d7c,d3a002880d70bd54915b998f8f2e284bf01f47a2..5b0db5a311fe76a8152893f553c8cdf0594c2c92
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -42,10 -19,6 +42,14 @@@ PH
    . Fixed bug #73279 (Integer overflow in gdImageScaleBilinearPalette()). (cmb)
    . Fixed bug #73280 (Stack Buffer Overflow in GD dynamicGetbuf). (cmb)
  
 +- Intl:
 +  . Fixed bug #73007 (add locale length check). (Stas)
 +  . Fixed bug #73218 (add mitigation for ICU int overflow). (Stas)
 +
++- MySQLi:
++  . Introduced new constant MYSQLI_OPT_READ_TIMEOUT to overwrite read timeout.
++    To be used with mysqli_options(). (Andrey)
++
  - OCI8
    . Fixed bug #71148 (Bind reference overwritten on PHP 7). (Oracle Corp.)
  

diff --cc ext/mysqli/mysqli.c
index 1e3cdad28fe5b9f3e1be6f92c0fbc0d5d071c53f,594dd0da35e7444bbdf939ccc0ddbdbb5565010b..412f9acf79a55ddcf6cc18aebbe01c53b2a06731
--- 1/ext/mysqli/mysqli.c
--- 2/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@@ -691,6 -696,6 +691,9 @@@ PHP_MINIT_FUNCTION(mysqli
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
++#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
++      REGISTER_LONG_CONSTANT("MYSQLI_OPT_READ_TIMEOUT", MYSQL_OPT_READ_TIMEOUT, CONST_CS | CONST_PERSISTENT);
++#endif
  #if defined(MYSQLI_USE_MYSQLND)
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE", MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE", MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);

diff --cc ext/mysqli/mysqli_api.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_connection.c
index 10addf0f10a4669932a76382e30816a0b03ea77b,427b1e6df931a3d9fd10346bb0ec7425e96b7e6a..4b5087a3df9a7e312d4d6fad854c2e2c77231535
--- 1/ext/mysqlnd/mysqlnd_connection.c
--- 2/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd_connection.c
@@@ -1676,10 -2329,9 +1676,8 @@@ MYSQLND_METHOD(mysqlnd_conn_data, set_c
                goto end;
        }
        switch (option) {
- #ifdef WHEN_SUPPORTED_BY_MYSQLI
 -              case MYSQL_OPT_COMPRESS:
                case MYSQL_OPT_READ_TIMEOUT:
                case MYSQL_OPT_WRITE_TIMEOUT:
- #endif
                case MYSQLND_OPT_SSL_KEY:
                case MYSQLND_OPT_SSL_CERT:
                case MYSQLND_OPT_SSL_CA:

diff --cc ext/mysqlnd/mysqlnd_net.c
Simple merge