Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  the darwin specific test fails for me with the same output which is the expected for the original test I couldn't find anybody who managed to see this test passing, but I found a bunch of other reports on qa.php.net/reports and on google which do see this test failing on mac. if this change causes you to have this test failing on Mac, please drop me a mail so we can improve the current test so it passes for everybody.
  5.5.21 now

Conflicts:
	configure.in
	main/php_version.h

ext/zlib/tests/bug_52944-darwin.phpt

@@ -1,24 +0,0 @@
---TEST--
-Bug #52944 (segfault with zlib filter and corrupted data)
---SKIPIF--
-<?php if (!extension_loaded("zlib")) print "skip"; ?>
-<?php
-if (PHP_OS != 'Darwin') {
-	die("skip Darwin only");
-}
---INI--
-allow_url_fopen=1
---FILE--
-<?php
-require dirname(__FILE__) . "/bug_52944_corrupted_data.inc";
-
-$fp = fopen('data://text/plain;base64,' . $data, 'r');
-stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ);
-var_dump(fread($fp,1));
-var_dump(fread($fp,1));
-fclose($fp);
-echo "Done.\n";
---EXPECT--
-string(1) "%"
-string(1) "C"
-Done.

ext/zlib/tests/bug_52944.phpt

@@ -2,10 +2,6 @@
 Bug #52944 (segfault with zlib filter and corrupted data)
 --SKIPIF--
 <?php if (!extension_loaded("zlib")) print "skip"; ?>
-<?php
-if (PHP_OS == 'Darwin') {
-	die("skip not for Darwin");
-}
 --INI--
 allow_url_fopen=1
 --FILE--