summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2013-08-19 23:19:51 -0700
committerStanislav Malyshev <stas@php.net>2013-08-19 23:19:51 -0700
commitd487f5e9acc55fb76d71c40e451efebbc087af35 (patch)
treea3fd6f76c2aed086ce372ccf40e3da058965936b
parentc60067c09a32af325d6cd70e4cfa6db3c78a8621 (diff)
downloadphp-git-d487f5e9acc55fb76d71c40e451efebbc087af35.tar.gz
bump version
-rw-r--r--NEWS13
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 15 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 8894bb4112..aeae233dc8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2013, PHP 5.4.19
+?? ??? 2013, PHP 5.4.20
- Core:
. Fixed bug #65481 (shutdown segfault due to serialize) (Mike)
@@ -56,7 +56,16 @@ PHP NEWS
. Fixed bug #65391 (Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called) (Mike)
-?? ??? 2013, PHP 5.4.18
+22 Aug 2013, PHP 5.4.19
+
+- Core:
+ . Fixed bug #64503 (Compilation fails with error: conflicting types for
+ 'zendparse'). (Laruence)
+
+- Openssl:
+ . Fixed UMR in fix for CVE-2013-4248.
+
+15 Aug 2013, PHP 5.4.18
- Core:
. Fixed value of FILTER_SANITIZE_FULL_SPECIAL_CHARS constant (previously was
diff --git a/configure.in b/configure.in
index 3d70758426..9a99680a47 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=4
-PHP_RELEASE_VERSION=19
+PHP_RELEASE_VERSION=20
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 18f15e1c49..9dc00237fe 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 4
-#define PHP_RELEASE_VERSION 19
+#define PHP_RELEASE_VERSION 20
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.4.19-dev"
-#define PHP_VERSION_ID 50419
+#define PHP_VERSION "5.4.20-dev"
+#define PHP_VERSION_ID 50420