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
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
Fixed bug #67715 (php-milter does not build and crashes randomly).
Update NEWS
Bug #51096 - Remove unnecessary ? for first/last day of
Merge branch 'pull-request/754' into PHP-5.4
Fix bug #67705 (extensive backtracking in rule regular expression)
add test
backport the fix for bug #67739
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
NEWS
typo
Fixed Bug #67724

(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data
5.4.33-dev now
Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Add EXPECTF