Commit:    8fb1aa618453149bb876bda4cafd1860468c4443
Author:    Gustavo Lopes <glo...@nebm.ist.utl.pt>         Tue, 6 Nov 2012 
13:36:40 +0100
Parents:   51394f76a5fca718fbf218888d97402f845ee261
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=8fb1aa618453149bb876bda4cafd1860468c4443

Log:
Destroy ancillary registry on shutdown

Changed paths:
  M  ext/sockets/sendrecvmsg.c


Diff:
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c
index 16330e0..88b937f 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();
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to