summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Lopes <glopes@nebm.ist.utl.pt>2012-11-06 13:36:40 +0100
committerGustavo Lopes <glopes@nebm.ist.utl.pt>2013-02-02 16:38:07 +0100
commit8fb1aa618453149bb876bda4cafd1860468c4443 (patch)
tree145b64f2659befbcfc93238b31382416ff8e5bd8
parent51394f76a5fca718fbf218888d97402f845ee261 (diff)
downloadphp-git-8fb1aa618453149bb876bda4cafd1860468c4443.tar.gz
Destroy ancillary registry on shutdown
-rw-r--r--ext/sockets/sendrecvmsg.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 16330e0ded..88b937f828 100644
--- a/ext/sockets/sendrecvmsg.c
+++ b/ext/sockets/sendrecvmsg.c
@@ -1541,6 +1541,13 @@ static void init_ancillary_registry(void)
#endif
}
+static void destroy_ancillary_registry(void)
+{
+ if (ancillary_registry.initialized) {
+ zend_hash_destroy(&ancillary_registry.ht);
+ ancillary_registry.initialized = 0;
+ }
+}
static ancillary_reg_entry *get_ancillary_reg_entry(int cmsg_level, int msg_type)
{
anc_reg_key key = { cmsg_level, msg_type };
@@ -1761,4 +1768,6 @@ void _socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS)
#ifdef ZTS
tsrm_mutex_free(ancillary_mutex);
#endif
+
+ destroy_ancillary_registry();
}