diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-20 05:40:19 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-20 05:40:19 -0700 |
| commit | 72d1ec883e73cfa5efc8e20314de2677440e00e7 (patch) | |
| tree | a3fd6f76c2aed086ce372ccf40e3da058965936b | |
| parent | dc384a571d4418d274f9ba9b270696950318daaa (diff) | |
| parent | d487f5e9acc55fb76d71c40e451efebbc087af35 (diff) | |
| download | php-git-72d1ec883e73cfa5efc8e20314de2677440e00e7.tar.gz | |
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
bump version
| -rw-r--r-- | NEWS | 13 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 15 insertions, 6 deletions
@@ -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 |