Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add RAND_egd check for compiling against LibreSSL

diff --cc NEWS
index f0da13ba9a62a005620ea6efbef55740318736cb,5cda6a28147c977a9b053acd5f205b3042e19a0b..0c02ce08d07e315c6f234e64cd6d7ffc2203d432
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -34,17 -31,13 +34,18 @@@ PH
    . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
      Welch)
  
 -- Mbstring:
 -  . Fixed bug #68846 (False detection of CJK Unified Ideographs Extension E).
 -    (Masaki Kagaya)
 +- Opcache:
 +  . Fixed bug #69297 (function_exists strange behavior with OPCache on
 +    disabled function). (Laruence)
  
 -- OpenSSL:
 -  . Fixed bug #67403 (Add signatureType to openssl_x509_parse).
 +- OpenSSL
 +  . Fixed bugs #68853, #65137 (Buffered crypto stream data breaks IO polling
 +    in stream_select() contexts) (Chris Wright)
 +  . Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)
 +    (Daniel Lowrey)
 +  . Fixed bug #69215 (Crypto servers should send client CA list)
 +    (Daniel Lowrey)
+   . Add a check for RAND_egd to allow compiling against LibreSSL (Leigh)
  
  - Postgres:
    . Fixed bug #68741 (Null pointer dereference) (CVE-2015-1352). (Laruence)
@@@ -54,15 -47,15 +55,15 @@@
       spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)
  
  - SOAP:
-    . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader 
+   . Fixed bug #69293 (NEW segfault when using SoapClient::__setSoapHeader 
 -     (bisected, regression)). (thomas at shadowweb dot org, Laruence)
 +     (bisected, regression)). (Laruence)
  
  - SQLITE:
-    . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception).
+   . Fixed bug #68760 (SQLITE segfaults if custom collator throws an exception).
       (Dan Ackroyd)
-    . Fixed bug #69287 (Upgrade bundled libsqlite to 3.8.8.3). (Anatol)
 -  . Fixed bug #69287 (Upgrade bundled sqlite to 3.8.8.3). (Anatol)
++  . Fixed bug #69287 (Upgrade bundled libsqlite to 3.8.8.3). (Anatol)
  
 -19 Mar 2015, PHP 5.5.23
 +19 Mar 2015, PHP 5.6.7
  
  - Core:
    . Fixed bug #69174 (leaks when unused inner class use traits precedence).

diff --cc ext/openssl/config0.m4
Simple merge

diff --cc ext/openssl/openssl.c
Simple merge