Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams

diff --cc NEWS
index 67f8630ced46a1930118f53d0d06949d7617e598,ba6eaaaf5cfbe57ed3b222eed7d177a9cf05a2e0..23f6bb2e23026553a3490e699643cd729ac3e319
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -13,33 -6,6 +13,35 @@@ PH
    . Fixed bug #67985 (Incorrect last used array index copied to new array after
      unset). (Tjerk)
  
 +- Fileinfo:
 +  . Fixed bug #67731 (finfo::file() returns invalid mime type
 +    for binary files). (Anatol)
 +
 +- GD:
 +  . Made fontFetch's path parser thread-safe. (Sara)
 +
 +- GMP:
 +  . Fixed bug #67917 (Using GMP objects with overloaded operators can cause
 +    memory exhaustion). (Nikita)
 +  . Fixed bug #50175 (gmp_init() results 0 on given base and number starting
 +    with 0x or 0b). (Nikita)
 +  . Implemented gmp_import() and gmp_export(). (Leigh, Nikita)
 +
 +- MySQLi:
 +  . Fixed bug #67839 (mysqli does not handle 4-byte floats correctly). (Keyur)
 +
 +- OpenSSL:
++  . Fixed bug #41631 (socket timeouts not honored in blocking SSL reads).
++    (Daniel Lowrey)
 +  . Fixed bug #67850 (extension won't build if openssl compiled without SSLv3).
 +    (Daniel Lowrey)
 +
 +- DOM:
 +  . Made DOMNode::textContent writeable. (Tjerk)
 +
 +- SOAP:
 +  . Fixed bug #67955 (SoapClient prepends 0-byte to cookie names). (Philip Hofstetter)
 +
  - Session:
    . Fixed bug #67972 (SessionHandler Invalid memory read create_sid()). (Adam)
  

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