]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-8.0'
authorMáté Kocsis <kocsismate@woohoolabs.com>
Tue, 16 Mar 2021 08:34:04 +0000 (09:34 +0100)
committerMáté Kocsis <kocsismate@woohoolabs.com>
Tue, 16 Mar 2021 08:34:41 +0000 (09:34 +0100)
* Fix crash in LDAP search functions during argument validation
* Fix ldap_next_entry() parameter name

1  2 
ext/ldap/ldap.c
ext/ldap/ldap.stub.php
ext/ldap/ldap_arginfo.h

diff --cc ext/ldap/ldap.c
Simple merge
Simple merge
index 643d94a82d2e3c853491d83862f162640073fa84,cb0da660ea380f0d23562ca4b747dd0885dcff68..14fac1a031472f27c330f7b6d65e7ee643c161e6
@@@ -1,5 -1,5 +1,5 @@@
  /* This is a generated file, edit the .stub.php file instead.
-  * Stub hash: 056fa51afdd7d40f9866ebd67837f5ddfa2c6236 */
 - * Stub hash: 9e097927708f5f1d0a2ed8267422e6095e8583b0 */
++ * Stub hash: 5cae0fbe180164126aa99ad5465822d87fe73fb9 */
  
  #if defined(HAVE_ORALDAP)
  ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)