Fix NEWS after 5.3.21
Merge branch 'PHP-5.3' into PHP-5.4
NEWS for bug #64023 (see aa0adce)
Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Merge branch 'PHP-5.3' into PHP-5.4
update NEWS
branched 5.4.12
Fix build problem in C++11
Fixed bug #64106: Segfault on SplFixedArray[][x] = y when extended
Merge branch 'PHP-5.3' into PHP-5.4
Added ssl context option, "disable_compression"

The CRIME attack vector exploits TLS compression. This patch adds a stream context option
allowing servers to disable TLS compression for versions of OpenSSL >= 1.0.0 (which first
introduced the SSL_OP_NO_COMPRESSION option). A summary rundown of the CRIME attack can
be found at https://community.qualys.com/blogs/securitylabs/2012/09/14/crime-information-leakage-attack-against-ssltls

Thanks to @DaveRandom for pointing out the relevant section of code.
NEWS entry new OpenSSL option [doc]
This will be PHP 5.3.23
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h