fix typo in ODBC code

5.4.30 next

update NEWS

Merge branch 'bug67251' into PHP-5.4

* bug67251:
Fix bug #67251 - date_parse_from_format out-of-bounds read

Conflicts:
ext/date/lib/parse_date.c

Merge branch 'bug67252' into PHP-5.4

* bug67252:
fix bug #67253: timelib_meridian_with_check out-of-bounds read
Fix bug #67252: convert_uudecode out-of-bounds read

Merge branch 'bug67250' into PHP-5.4

* bug67250:
Fix bug #67250 (iptcparse out-of-bounds read)

- Updated to version 2014.3 (2014c)

fix test - output can be chunked

Fix bug #67060: use default mode of 660

fix bug #67253: timelib_meridian_with_check out-of-bounds read

Fix bug #67252: convert_uudecode out-of-bounds read

Fix bug #67251 - date_parse_from_format out-of-bounds read

Fix bug #67250 (iptcparse out-of-bounds read)

Fix bug #67247 spl_fixedarray_resize integer overflow

fix news

Updated NEWS

Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245)
Linux apparently does not like memcpy in overlapping regions...

- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)

- Move checking

- Fixed missing NULL check in SimpleXMLElement::xpath()

- Fixed missing NULL check

oops, 5.4 and 5.5 use malloc in TSRM

Fix memory leak in TSRM

Fixed test (it requires ext/hash)

Fixed tests (they might fail from time to time because of session GC)