mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-7.0' into PHP-7.1
This commit is contained in:
commit
314ef0ff69
5 changed files with 23 additions and 0 deletions
4
NEWS
4
NEWS
|
@ -12,6 +12,10 @@ PHP NEWS
|
|||
. Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*).
|
||||
(somedaysummer)
|
||||
|
||||
- PDO MySQL:
|
||||
. Fixed bug #71003 (Expose MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT to PDO
|
||||
interface). (Thomas Orozco)
|
||||
|
||||
- SPL:
|
||||
. Fixed bug #74058 (ArrayObject can not notice changes). (Andrew Nester)
|
||||
|
||||
|
|
|
@ -735,6 +735,18 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
|
|||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef PDO_USE_MYSQLND
|
||||
{
|
||||
zend_long ssl_verify_cert = pdo_attr_lval(driver_options,
|
||||
PDO_MYSQL_ATTR_SSL_VERIFY_SERVER_CERT, -1);
|
||||
if (ssl_verify_cert != -1) {
|
||||
connect_opts |= ssl_verify_cert ?
|
||||
CLIENT_SSL_VERIFY_SERVER_CERT:
|
||||
CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef PDO_MYSQL_HAS_CHARSET
|
||||
|
|
|
@ -130,6 +130,9 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
|
|||
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (zend_long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
|
||||
#endif
|
||||
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
|
||||
#ifdef PDO_USE_MYSQLND
|
||||
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_VERIFY_SERVER_CERT", (zend_long)PDO_MYSQL_ATTR_SSL_VERIFY_SERVER_CERT);
|
||||
#endif
|
||||
|
||||
#ifdef PDO_USE_MYSQLND
|
||||
mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api);
|
||||
|
|
|
@ -179,6 +179,9 @@ enum {
|
|||
PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY,
|
||||
#endif
|
||||
PDO_MYSQL_ATTR_MULTI_STATEMENTS,
|
||||
#ifdef PDO_USE_MYSQLND
|
||||
PDO_MYSQL_ATTR_SSL_VERIFY_SERVER_CERT,
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -27,6 +27,7 @@ if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) {
|
|||
"MYSQL_ATTR_SSL_CIPHER" => true,
|
||||
"MYSQL_ATTR_COMPRESS" => true,
|
||||
"MYSQL_ATTR_MULTI_STATEMENTS" => true,
|
||||
"MYSQL_ATTR_SSL_VERIFY_SERVER_CERT" => true,
|
||||
);
|
||||
|
||||
if (!MySQLPDOTest::isPDOMySQLnd()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue