From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 12 Nov 2015 10:52:52 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha1~814
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7cae94d75134f0b8b25a78d814dcf3ca60f5b10e;p=php

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

* 'master' of git.php.net:php-src:
  add test for bug #70898
  Also protects this one
  Update NEWS
  Re-fixed #70895
  Revert "Fixed bug Bug #70895 null ptr deref and segfault"
  Revert "refix bug #70895"
  Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
  Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
  Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
  update NEWS
  refix bug #70895
  Fixed bug Bug #70895 null ptr deref and segfault
---

7cae94d75134f0b8b25a78d814dcf3ca60f5b10e