diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-30 15:54:36 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-30 15:54:36 -0700 |
| commit | aeb6e9c264fc0054fb829da13c739cdafa276115 (patch) | |
| tree | 82baf6c106380c00f932ab001e832766f23c6e2b /ext/ldap/ldap.c | |
| parent | 0eb414e2a56de3668f36c01e86136d7ce3c404a3 (diff) | |
| parent | d7baf0427fb56cbde55495e5c2071b1cdacb94ce (diff) | |
| download | php-git-aeb6e9c264fc0054fb829da13c739cdafa276115.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Michael Wallner (2) and others
# Via Christopher Jones (4) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Make 'make distclean' remove the downloaded pear PHAR
fix test
fix memleak on resetting rebind_proc
Fix bug #64979: Wrong behavior of static variables in closure generators
Fix bug #65322: compile time errors won't trigger auto loading
5.5.4 release date
5.4.20 release date
Diffstat (limited to 'ext/ldap/ldap.c')
| -rw-r--r-- | ext/ldap/ldap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 3cfa2092e7..71d57d6d9b 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -2107,6 +2107,7 @@ PHP_FUNCTION(ldap_set_rebind_proc) /* unregister rebind procedure */ if (ld->rebindproc != NULL) { zval_dtor(ld->rebindproc); + FREE_ZVAL(ld->rebindproc); ld->rebindproc = NULL; ldap_set_rebind_proc(ld->link, NULL, NULL); } |