Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)

diff --cc NEWS
index e4fdda0dd071bad6d46d4f9663226b0b91f93696,aab586ae9fb5260e8c1e371f365e16e83b79e80d..ca0132313e3777e91a76cd9cc31622a1315eb543
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,7 -5,12 +5,10 @@@ PH
  - Core:
    . Fixed bug #66609 (php crashes with __get() and ++ operator in some cases).
      (Dmitry, Laruence)
 -  . Fixed bug #67626 (User exceptions not properly handled in streams). 
 -    (Julian)
    . Fixed bug #68917 (parse_url fails on some partial urls). (Wei Dai)
+   . Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM
+     configuration options). (Anatol Belski)
+   . Fixed bug #69207 (move_uploaded_file allows nulls in path). (Stas)
    . Fixed bug #69212 (Leaking VIA_HANDLER func when exception thrown in
      __call/... arg passing). (Nikita)
    . Fixed bug #69221 (Segmentation fault when using a generator in combination
@@@ -21,14 -26,14 +24,18 @@@
    . 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)
 +- 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)
  
+ - SOAP:
+   . Fixed bug #69085 (SoapClient's __call() type confusion through
+     unserialize()). (Dmitry)
+ 
  - SPL:
     . Fixed #69227 (Use after free in zval_scan caused by
       spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)