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
Fixed usage after free
Fixed bug #67693 - incorrect push to the empty array
Updated NEWS for #67693
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
Updated NEWS for #67693
We need to turn off any strict mode here for this warning to show up
Merge commit '8b9719d' into PHP-5.5

* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
Fixed bug #67715 (php-milter does not build and crashes randomly).
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).
BFN
Update NEWS
Update NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update NEWS
Bug #51096 - Remove unnecessary ? for first/last day of
Merge branch 'pull-request/754' into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
	ext/date/lib/parse_date.c
Fix wrong lenght size