PHPC-854: Initialize persistent client hash directly in GINIT

Previous initialization during MINIT and using the accessor macro was causing crashes in Apache.

This also declares externs for TSRMLS_CACHE, as is done in other extensions.

Author: jmikola

php_phongo.c

@@ -1984,6 +1984,18 @@ PHP_INI_BEGIN()
 PHP_INI_END()
 /* }}} */
 
+#if PHP_VERSION_ID >= 70000
+static void php_phongo_client_dtor(zval *zv)
+{
+	mongoc_client_destroy((mongoc_client_t *) Z_PTR_P(zv));
+}
+#else
+static void php_phongo_client_dtor(void *client)
+{
+	mongoc_client_destroy(*((mongoc_client_t **) client));
+}
+#endif
+
 /* {{{ PHP_GINIT_FUNCTION */
 PHP_GINIT_FUNCTION(mongodb)
 {
@@ -1998,24 +2010,13 @@ PHP_GINIT_FUNCTION(mongodb)
 	ZEND_TSRMLS_CACHE_UPDATE();
 #endif
 #endif
-	mongodb_globals->debug_fd = NULL;
+	memset(mongodb_globals, 0, sizeof(zend_mongodb_globals));
 	mongodb_globals->bsonMemVTable = bsonMemVTable;
-
+	/* Initialize HashTable for persistent clients */
+	zend_hash_init_ex(&mongodb_globals->clients, 0, NULL, php_phongo_client_dtor, 1, 0);
 }
 /* }}} */
 
-#if PHP_VERSION_ID >= 70000
-static void php_phongo_client_dtor(zval *zv)
-{
-	mongoc_client_destroy((mongoc_client_t *) Z_PTR_P(zv));
-}
-#else
-static void php_phongo_client_dtor(void *client)
-{
-	mongoc_client_destroy(*((mongoc_client_t **) client));
-}
-#endif
-
 /* {{{ PHP_MINIT_FUNCTION */
 PHP_MINIT_FUNCTION(mongodb)
 {
@@ -2037,9 +2038,6 @@ PHP_MINIT_FUNCTION(mongodb)
 	/* Initialize libbson */
 	bson_mem_set_vtable(&MONGODB_G(bsonMemVTable));
 
-	/* Initialize HashTable for persistent clients */
-	zend_hash_init(&MONGODB_G(clients), 0, NULL, php_phongo_client_dtor, 1);
-
 	/* Prep default object handlers to be used when we register the classes */
 	memcpy(&phongo_std_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	phongo_std_object_handlers.clone_obj            = NULL;

php_phongo.h

@@ -48,7 +48,10 @@ ZEND_BEGIN_MODULE_GLOBALS(mongodb)
 ZEND_END_MODULE_GLOBALS(mongodb)
 
 #if PHP_VERSION_ID >= 70000
-#   define MONGODB_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mongodb, v)
+# define MONGODB_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mongodb, v)
+# if defined(ZTS) && defined(COMPILE_DL_MONGODB)
+ZEND_TSRMLS_CACHE_EXTERN()
+# endif
 #else
 #   ifdef ZTS
 #   	define MONGODB_G(v) TSRMG(mongodb_globals_id, zend_mongodb_globals *, v)