Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct

diff --cc NEWS
index 2b4479c5502b7b316baf15cc08725d2ffd7d701f,ae6c25a8f42b3b1beff03777f9219e288942a1b7..22e47a4b24df42b8eaacdc8aa83db3d1b20cf873
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -24,14 -26,16 +24,17 @@@ 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)
 -
 -- 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)
  
+ - Postgres:
+   . Fixed bug #68741 (Null pointer deference) (CVE-2015-1352). (Xinchen Hui)
+ 
  - SPL:
     . Fixed bug #69227 (Use after free in zval_scan caused by
       spl_object_storage_get_gc). (adam dot scarr at 99designs dot com)

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