From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 30 May 2017 21:41:12 +0000 (+0300)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da01fa3897419c9d3735544d0f3eea21957bc8a5;p=php

Merge branch 'PHP-7.1'

* 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.
---

da01fa3897419c9d3735544d0f3eea21957bc8a5