]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a916bed 316aaca)
Merge branch 'PHP-7.1'
authorDmitry Stogov <dmitry@zend.com>
Tue, 30 May 2017 21:41:12 +0000 (00:41 +0300)
committerDmitry Stogov <dmitry@zend.com>
Tue, 30 May 2017 21:41:12 +0000 (00:41 +0300)
* PHP-7.1:
  Fixed wrong condition
  ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
  ext/ldap: Allow default host from ldap.conf to work.

1  2 
ext/opcache/Optimizer/pass1_5.c patch | diff1 | diff2 | blob | history

diff --cc ext/opcache/Optimizer/pass1_5.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.