php7-fpm.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. Index: ext/intl/msgformat/msgformat_helpers.cpp
  2. --- ext/intl/msgformat/msgformat_helpers.cpp.orig 2015-12-01 14:36:42.000000000 +0100
  3. +++ ext/intl/msgformat/msgformat_helpers.cpp 2015-12-02 20:17:51.198927871 +0100
  4. @@ -62,11 +62,13 @@
  5. #endif
  6. };
  7. +#if 0
  8. const Formattable::Type*
  9. MessageFormatAdapter::getArgTypeList(const MessageFormat& m,
  10. int32_t& count) {
  11. return m.getArgTypeList(count);
  12. }
  13. +#endif
  14. #ifdef HAS_MESSAGE_PATTERN
  15. const MessagePattern
  16. Index: ext/pdo_mysql/mysql_driver.c
  17. --- ext/pdo_mysql/mysql_driver.c.orig 2015-12-01 14:36:34.000000000 +0100
  18. +++ ext/pdo_mysql/mysql_driver.c 2015-12-02 20:17:51.198927871 +0100
  19. @@ -724,7 +724,7 @@
  20. }
  21. }
  22. -#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
  23. +#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
  24. {
  25. zend_string *public_key = pdo_attr_strval(driver_options, PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY, NULL);
  26. if (public_key) {
  27. Index: ext/pdo_mysql/pdo_mysql.c
  28. --- ext/pdo_mysql/pdo_mysql.c.orig 2015-12-02 20:17:51.198927000 +0100
  29. +++ ext/pdo_mysql/pdo_mysql.c 2015-12-02 20:24:30.589062022 +0100
  30. @@ -126,7 +126,7 @@
  31. REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CA", (zend_long)PDO_MYSQL_ATTR_SSL_CA);
  32. REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CAPATH", (zend_long)PDO_MYSQL_ATTR_SSL_CAPATH);
  33. REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SSL_CIPHER", (zend_long)PDO_MYSQL_ATTR_SSL_CIPHER);
  34. -#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
  35. +#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
  36. REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (zend_long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
  37. #endif
  38. REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
  39. Index: ext/pdo_mysql/php_pdo_mysql_int.h
  40. --- ext/pdo_mysql/php_pdo_mysql_int.h.orig 2015-12-01 14:36:34.000000000 +0100
  41. +++ ext/pdo_mysql/php_pdo_mysql_int.h 2015-12-02 20:17:51.208953657 +0100
  42. @@ -175,7 +175,7 @@
  43. PDO_MYSQL_ATTR_SSL_CA,
  44. PDO_MYSQL_ATTR_SSL_CAPATH,
  45. PDO_MYSQL_ATTR_SSL_CIPHER,
  46. -#if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
  47. +#if MYSQL_VERSION_ID > 50605 && defined(PDO_USE_MYSQLND)
  48. PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY,
  49. #endif
  50. PDO_MYSQL_ATTR_MULTI_STATEMENTS,