Fix bug #55496 Interactive mode doesn't force a newline before the prompt
Merge branch 'PHP-5.4' into PHP-5.5
BFN
Fix bug #67496 Save command history when exiting interactive shell with control-c
Merge branch 'PHP-5.4' into PHP-5.5
BFN
Add CVE no
Fixed Bug #67538 (SPL Iterators use-after-free)
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
update NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
Fix missing type checks in various functions
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix missing type checks in various functions
fix NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix NEWS
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)

The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
Corrected patch for bug #60616

For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
Undo inadvertent commit of php_version
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616