]> granicus.if.org Git - php/commitdiff
Destroy ancillary registry on shutdown
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Tue, 6 Nov 2012 12:36:40 +0000 (13:36 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 2 Feb 2013 15:38:07 +0000 (16:38 +0100)
ext/sockets/sendrecvmsg.c

index 16330e0ded0eca6b19bbaa37547d5f8cbf6056dc..88b937f8285ecfbe59b13783dab06895044857e3 100644 (file)
@@ -1540,6 +1540,13 @@ static void init_ancillary_registry(void)
                        to_zval_read_fd_array, SOL_SOCKET, SCM_RIGHTS);
 #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)
 {
@@ -1761,4 +1768,6 @@ void _socket_sendrecvmsg_shutdown(SHUTDOWN_FUNC_ARGS)
 #ifdef ZTS
        tsrm_mutex_free(ancillary_mutex);
 #endif
+
+       destroy_ancillary_registry();
 }