From 3656349990cf67b32df8155901e76a88ea2cea44 Mon Sep 17 00:00:00 2001
From: Julien Pauli <jpauli@php.net>
Date: Wed, 26 Nov 2014 11:31:58 +0100
Subject: 5.5.21 now

---
 NEWS               | 7 ++++++-
 configure.in       | 2 +-
 main/php_version.h | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index fd082766a5..2694863caa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.20
+?? ??? 2014, PHP 5.5.21
+
+
+
+
+11 Dec 2014, PHP 5.5.20
 
 - Core:
   . Fixed bug #68091 (Some Zend headers lack appropriate extern "C" blocks).
diff --git a/configure.in b/configure.in
index b16a97e72c..358b94d37b 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=20
+PHP_RELEASE_VERSION=21
 PHP_EXTRA_VERSION="-dev"
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
diff --git a/main/php_version.h b/main/php_version.h
index 3e5d9d8b3e..dc81b9188d 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 20
+#define PHP_RELEASE_VERSION 21
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.20-dev"
-#define PHP_VERSION_ID 50520
+#define PHP_VERSION "5.5.21-dev"
+#define PHP_VERSION_ID 50521
-- 
cgit v1.2.1


From 5d67e8617b5d0bf9015bb8ea4df570e19aed89de Mon Sep 17 00:00:00 2001
From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 27 Nov 2014 00:08:40 +0100
Subject: 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.

---
 ext/zlib/tests/bug_52944-darwin.phpt | 24 ------------------------
 ext/zlib/tests/bug_52944.phpt        |  4 ----
 2 files changed, 28 deletions(-)
 delete mode 100644 ext/zlib/tests/bug_52944-darwin.phpt

diff --git a/ext/zlib/tests/bug_52944-darwin.phpt b/ext/zlib/tests/bug_52944-darwin.phpt
deleted file mode 100644
index c25babadf5..0000000000
--- a/ext/zlib/tests/bug_52944-darwin.phpt
+++ /dev/null
@@ -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.
diff --git a/ext/zlib/tests/bug_52944.phpt b/ext/zlib/tests/bug_52944.phpt
index ff82d29cc7..68bd53791d 100644
--- a/ext/zlib/tests/bug_52944.phpt
+++ b/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--
-- 
cgit v1.2.1