diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 18:14:14 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-29 18:14:14 +0300 |
| commit | 6cf6f2c6bf0b386c7bcaea0479f2f676d3ef8069 (patch) | |
| tree | e5476f5f73ac370d8f1f8503cd5c2ee75fd5baab /ext/intl/breakiterator/breakiterator_methods.cpp | |
| parent | dc588997e202b5a645052bfb21098cc571693569 (diff) | |
| parent | ee1e67fae6f649894721a5293ad9ab290add121f (diff) | |
| download | php-git-6cf6f2c6bf0b386c7bcaea0479f2f676d3ef8069.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
On Windows PHP may be restarted with different set of DSO extensions without SHM reset. This may make optimisation for entities from DSO extensions inconsistent.
Putting back deprecated symbols for ldap_sort
Removed deprecated function calls from ldap module
Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_methods.cpp')
0 files changed, 0 insertions, 0 deletions