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

* 'PHP-5.4' of git.php.net:php-src:
  bump version
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
added use_keys argument to array_filter()
forgot introspection changes
fixed test case to pass on other systems than my own
added bitmask variation
Using only two constants to signal use type intent.
Better test: Check combined leading/trailing
Merge branch 'PHP-5.4' into JSONWhitespaceFix
UPGRADING and NEWS
initial move on renaming files and fixing includes
applied and fixed the original patch

initial work on the patch import done
preserve the error code

otherwise it'd be cleared by a subsequent calls
fixed all the places where last error could be lost

whereby this commit should be applied to master anyway
updated NEWS
fixed virtual cwd header in phar
fixed invalid free
Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
	Draal
Conflicts:
	configure.in
	main/php_version.h
add tests for bug #62523
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h