![]() |
php.net | support | documentation | report a bug | advanced search | search howto | statistics | random bug | login |
Patch php_ldap_do_search.patch for LDAP related Bug #61853Patch version 2012-04-25 20:52 UTC Return to Bug #61853 | Download this patchThis patch is obsolete Obsoleted by patches: This patch renders other patches obsolete Obsolete patches: Patch Revisions: 2012-04-25 20:52 UTC | 2012-04-25 20:38 UTCDeveloper: etienne@lamaisondebarbie.ch--- ldap.orig.c 2012-04-25 21:34:54.011391743 +0200 +++ ldap.c 2012-04-25 22:07:42.061150869 +0200 +++ ldap.c 2012-04-25 22:50:06.233766715 +0200 @@ -546,19 +546,8 @@ /* {{{ php_set_opts */ + zend_hash_move_forward(Z_ARRVAL_P(link)); } @@ -748,10 +769,39 @@ @@ -748,10 +769,38 @@ goto cleanup; } - php_set_opts(ld->link, ldap_sizelimit, ldap_timelimit, ldap_deref, &old_ldap_sizelimit, &old_ldap_timelimit, &old_ldap_deref); Line 111 (now 111), was 13 lines, now 12 lines + clientctrl, + NULL, /* timeval not defined, see ldap.h */ + ldap_sizelimit, + &ldap_res); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passed ldap_search_ext_s"); if (errno != LDAP_SUCCESS && errno != LDAP_SIZELIMIT_EXCEEDED @@ -779,9 +829,20 @@ @@ -779,9 +828,19 @@ } cleanup: + /* Free controls */ Line 128 (now 127), was 9 lines, now 8 lines + if(serverctrl != NULL) { + ldap_controls_free(serverctrl); + serverctrl = NULL; + } + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passed ldap_controls_free"); + if (ld) { /* Restoring previous options */ - php_set_opts(ld->link, old_ldap_sizelimit, old_ldap_timelimit, old_ldap_deref, &ldap_sizelimit, &ldap_timelimit, &ldap_deref); |
![]() All rights reserved. |
Last updated: Sat Feb 15 01:01:29 2025 UTC |