Merge branch 'PHP-5.6'

* PHP-5.6:
  Update PCRE version (bug #69689)
  move test
  NEWS 5.4
  fix new test
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  5.4.42 next

diff --cc ext/pcre/pcrelib/config.h
index d0fde3b497b055b4f1d72fb6ef465d32004d8304,ba06a175095a7a4db1533ee41c1b1d0e09ef3f1d..9714cf5bbdb8f3b1cb338f747b929ee3a2dfa35a
--- 1/ext/pcre/pcrelib/config.h
--- 2/ext/pcre/pcrelib/config.h
+++ b/ext/pcre/pcrelib/config.h
@@@ -271,8 -323,14 +271,8 @@@ sure both macros are undefined; an emul
  #define PACKAGE_URL ""
  
  /* Define to the version of this package. */
- #define PACKAGE_VERSION "8.36"
+ #define PACKAGE_VERSION "8.37"
  
 -/* to make a symbol visible */
 -/* #undef PCRECPP_EXP_DECL */
 -
 -/* to make a symbol visible */
 -/* #undef PCRECPP_EXP_DEFN */
 -
  /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested
     parentheses (of any kind) in a pattern. This limits the amount of system
     stack that is used while compiling a pattern. */