Mark persistent connection related data as "thread-local".

diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
index e836ef12381787feca485356d356f16e3920d1db..a788c457747bea4367f59b025497f05d03662333 100644 (file)
--- a/ext/mysqlnd/mysqlnd_connection.c
+++ b/ext/mysqlnd/mysqlnd_connection.c
@@ -1859,8 +1859,11 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option_2d)(MYSQLND_CONN_DATA * cons
                        DBG_INF_FMT("Adding [%s][%s]", key, value);
                        {
                                zval attrz;
+                               zend_string *str = zend_string_init(key, strlen(key), 1);
+                               GC_MAKE_PERSISTENT_LOCAL(str);
                                ZVAL_NEW_STR(&attrz, zend_string_init(value, strlen(value), conn->persistent));
-                               zend_hash_str_update(conn->options->connect_attr, key, strlen(key), &attrz);
+                               GC_MAKE_PERSISTENT_LOCAL(Z_COUNTED(attrz));
+                               zend_hash_update(conn->options->connect_attr, str, &attrz);
                        }
                        break;
                default: