Merge branch 'PHP-5.4' of git://git.php.net/php-src into PHP-5.4

* 'PHP-5.4' of git://git.php.net/php-src:
  updated libmagic.patch
  update news with CVE
  NEWS
  Fixed Bug #66731 file: infinite recursion
  5.4.27 now
  update NEWS
  Fixed broken build when EC unavailable
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
  Refactor build_tablename()
  Revise encoding blacklist
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Refactor and cleanup. WS is cleaned up. Use -b if it is needed. Added compatibility macros, PQescapeStringConn, PGSQLescapeLiteral/Identifier, PGSQLfree.
Merge branch 'PHP-5.5' of git://git.php.net/php-src into PHP-5.5

* 'PHP-5.5' of git://git.php.net/php-src: (23 commits)
  updated libmagic.patch
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
  5.4.27 now
  update NEWS
  Fixed broken build when EC unavailable
  Updated NEWS for #65753
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)
  Update NEWS
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
  Refactor build_tablename()
  Revise encoding blacklist
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  ...
Fix tests failing if EC unavailable
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix tests failing if EC unavailable

Conflicts:
	ext/openssl/openssl.c