You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.7 KiB
37 lines
1.7 KiB
11 years ago
|
Index: ext/pdo_mysql/mysql_driver.c
|
||
|
|
--- ext/pdo_mysql/mysql_driver.c.orig 2015-01-21 01:40:37.000000000 +0100
|
||
|
|
+++ ext/pdo_mysql/mysql_driver.c 2015-01-23 08:17:48.288783198 +0100
|
||
|
|
@@ -716,7 +716,7 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
|
||
|
|
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
|
||
|
|
{
|
||
|
|
char *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL TSRMLS_CC);
|
||
|
|
if (public_key) {
|
||
|
|
Index: ext/pdo_mysql/pdo_mysql.c
|
||
|
|
--- ext/pdo_mysql/pdo_mysql.c.orig 2015-01-23 08:17:48.288783000 +0100
|
||
|
|
+++ ext/pdo_mysql/pdo_mysql.c 2015-01-23 08:19:12.129123870 +0100
|
||
|
|
@@ -123,7 +123,7 @@
|
||
|
|
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (long)PDO_MYSQL_ATTR_SSL_CA);
|
||
|
|
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (long)PDO_MYSQL_ATTR_SSL_CAPATH);
|
||
|
|
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (long)PDO_MYSQL_ATTR_SSL_CIPHER);
|
||
|
|
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
|
||
|
|
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
|
||
|
|
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
|
||
|
|
#endif
|
||
|
|
REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
|
||
|
|
Index: ext/pdo_mysql/php_pdo_mysql_int.h
|
||
|
|
--- ext/pdo_mysql/php_pdo_mysql_int.h.orig 2015-01-23 08:17:48.288783000 +0100
|
||
|
|
+++ ext/pdo_mysql/php_pdo_mysql_int.h 2015-01-23 08:19:37.638772513 +0100
|
||
|
|
@@ -171,7 +171,7 @@
|
||
|
|
PDO_MYSQL_ATTR_SSL_CA,
|
||
|
|
PDO_MYSQL_ATTR_SSL_CAPATH,
|
||
|
|
PDO_MYSQL_ATTR_SSL_CIPHER,
|
||
|
|
-#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
|
||
|
|
+#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
|
||
|
|
PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY,
|
||
|
|
#endif
|
||
|
|
PDO_MYSQL_ATTR_MULTI_STATEMENTS,
|