From: Jakub Zelenka <bukka@php.net>
Date: Wed, 14 Sep 2016 11:34:39 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25b4bd1606d1282d726b2240633563bbfb08ffb3;p=php

Merge branch 'PHP-7.0' into PHP-7.1
---

25b4bd1606d1282d726b2240633563bbfb08ffb3
diff --cc NEWS
index 8a80d0e5f6,d209f23eef..41780ebb07
--- a/NEWS
+++ b/NEWS
@@@ -28,6 -31,13 +28,10 @@@ PH
    . Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp()
      function). (Laruence)
  
+ - OpenSSL:
+   . Fixed bug #73072 (Invalid path SNI_server_certs causes segfault).
+     (Jakub Zelenka)
+ 
 -- phpdbg:
 -  . Fixed bug #72996 (phpdbg_prompt.c undefined reference to DL_LOAD). (Nikita)
 -
  - Session:
    . Fixed bug #68015 (Session does not report invalid uid for files save handler).
      (Yasuo)