From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 23 Jun 2016 12:59:28 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha3~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=697e3bb48b28364a2301ac8a4eeee4d0382730ca;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  typo
  Turn safe timeout handling into general interrupt handling ability.
  Fixed compilation warnings
  yet another test rewrite
  Add additional LDAP SASL constants
  Add tests for LDAP_OPT_* constants
  Add LDAP TLS Protocol Min constants
  Add tests for the LDAP CRL check option
  Add missing LDAP constants
---

697e3bb48b28364a2301ac8a4eeee4d0382730ca