diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
| commit | 7b4983c8f82c4f361df787f58c6f5cf88d5def0b (patch) | |
| tree | e38e8ffceb65a0f2492b28e2b07c8668fcddeda4 /ext/ldap/ldap.c | |
| parent | a0cfab65ea72963f81a3440a3587d11bd7800337 (diff) | |
| download | php-git-7b4983c8f82c4f361df787f58c6f5cf88d5def0b.tar.gz | |
Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type()
* Switched register_list_destructors() to use
zend_register_list_destructors_ex() instead
* Updated all relevant modules to provide the resource type name
to register_list_destructors() call
* Updated var_dump() to output resource type name instead of number
@- Made resource type names visible, e.g. var_dump() and
@ get_resource_type() display "file" for file resources. (Andrei)
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 6bf16de8ca..a6ae69b14b 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -118,8 +118,9 @@ ZEND_GET_MODULE(ldap) #endif -static void _close_ldap_link(LDAP *ld) +static void _close_ldap_link(zend_rsrc_list_entry *rsrc) { + LDAP *ld = (LDAP *)rsrc->ptr; LDAPLS_FETCH(); ldap_unbind_s(ld); @@ -128,8 +129,9 @@ static void _close_ldap_link(LDAP *ld) } -static void _free_ldap_result(LDAPMessage *result) +static void _free_ldap_result(zend_rsrc_list_entry *rsrc) { + LDAPMessage *result = (LDAPMessage *)rsrc->ptr; ldap_msgfree(result); } @@ -179,8 +181,8 @@ PHP_MINIT_FUNCTION(ldap) REGISTER_MAIN_LONG_CONSTANT("GSLC_SSL_TWOWAY_AUTH", GSLC_SSL_TWOWAY_AUTH, CONST_PERSISTENT | CONST_CS); #endif - le_result = register_list_destructors(_free_ldap_result, NULL); - le_link = register_list_destructors(_close_ldap_link, NULL); + le_result = register_list_destructors(_free_ldap_result, NULL, "ldap result"); + le_link = register_list_destructors(_close_ldap_link, NULL, "ldap link"); ldap_module_entry.type = type; |