fix test
Replace the CLI server's linear search for extensions with a hash table.

This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
Move the mime type map out of php_cli_server.c for easier generation.
Add a mime type map generation script and update the header.
Fix broken test.
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
5.4.31 next
Fix bug #66127 (Segmentation fault with ArrayObject unset)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
update NEWS
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
Revert "Add optional second arg to unserialize()"

This reverts commit cfd104582220d578ab1b78a5991065d038e1f931.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert "Add optional second arg to unserialize()"
Merge branch 'master' of git://github.com/php/php-src