X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-pq;a=blobdiff_plain;f=src%2Fphp_pq_module.c;h=cd992172d9e524bc9c6ccdd15d151fcdf43c806e;hp=989b7c8f5d11d701e653f7f5348b5b956c45ed61;hb=b9f66d2b7378c40f85111ef57e9b0922789f77df;hpb=6840072b9e4fe5269d0f36a9cb8cd9cde04525af

diff --git a/src/php_pq_module.c b/src/php_pq_module.c
index 989b7c8..cd99217 100644
--- a/src/php_pq_module.c
+++ b/src/php_pq_module.c
@@ -18,7 +18,7 @@
 #include <php.h>
 #include <ext/standard/info.h>
 
-#include <libpq-fe.h>
+#include <libpq-events.h>
 
 #include "php_pq.h"
 #include "php_pq_misc.h"
@@ -33,14 +33,23 @@
 #include "php_pqtxn.h"
 #include "php_pqtypes.h"
 
+ZEND_DECLARE_MODULE_GLOBALS(php_pq);
+
+static void php_pq_globals_init_once(zend_php_pq_globals *G)
+{
+	memset(G, 0, sizeof(*G));
+}
+
 #define PHP_MINIT_CALL(i) do { \
-	if (SUCCESS != PHP_MINIT(i)(type, module_number TSRMLS_CC)) { \
+	if (SUCCESS != PHP_MINIT(i)(type, module_number)) { \
 		return FAILURE; \
 	} \
 } while(0)
 
 static PHP_MINIT_FUNCTION(pq)
 {
+	ZEND_INIT_MODULE_GLOBALS(php_pq, php_pq_globals_init_once, NULL);
+
 	PHP_MINIT_CALL(pq_misc);
 	PHP_MINIT_CALL(pqexc);
 
@@ -56,19 +65,17 @@ static PHP_MINIT_FUNCTION(pq)
 	PHP_MINIT_CALL(pqcopy);
 	PHP_MINIT_CALL(pqlob);
 
-	return php_persistent_handle_provide(ZEND_STRL("pq\\Connection"), php_pqconn_get_resource_factory_ops(), NULL, NULL TSRMLS_CC);
+	return SUCCESS;
 }
 
 #define PHP_MSHUT_CALL(i) do { \
-	if (SUCCESS != PHP_MSHUTDOWN(i)(type, module_number TSRMLS_CC)) { \
+	if (SUCCESS != PHP_MSHUTDOWN(i)(type, module_number)) { \
 		return FAILURE; \
 	} \
 } while(0)
 
 static PHP_MSHUTDOWN_FUNCTION(pq)
 {
-	php_persistent_handle_cleanup(ZEND_STRL("pq\\Connection"), NULL, 0 TSRMLS_CC);
-
 	PHP_MSHUT_CALL(pqlob);
 	PHP_MSHUT_CALL(pqcopy);
 	PHP_MSHUT_CALL(pqcur);