diff options
| author | Julien Pauli <jpauli@php.net> | 2016-04-27 11:47:07 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2016-04-27 11:47:07 +0200 |
| commit | 633bb5ccb4f55ef140447b3faaeb7a6614909a63 (patch) | |
| tree | c9b16c23b8e1ea7860d7d9f4b2a9345cad680ce2 | |
| parent | 61c7a06e7c19d9b408db1129efa0959a0acbf0b1 (diff) | |
| download | php-git-633bb5ccb4f55ef140447b3faaeb7a6614909a63.tar.gz | |
5.5.35
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | main/php_version.h | 6 |
3 files changed, 8 insertions, 11 deletions
@@ -1,11 +1,5 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -** PHP 5.5 is in security-only mode , please do not commit to this branch ** - -??? 2016, PHP 5.5.36 - - - 28 Apr 2016, PHP 5.5.35 - BCMath: @@ -23,6 +17,9 @@ PHP NEWS . Fix bug #72061 (Out-of-bounds reads in zif_grapheme_stripos with negative offset). (Stas) +- XML: + . Fix bug #72099 (xml_parse_into_struct segmentation fault). (Stas) + 31 Mar 2016, PHP 5.5.34 - Fileinfo: diff --git a/configure.in b/configure.in index 375e5941b9..3feddcdf7e 100644 --- a/configure.in +++ b/configure.in @@ -119,8 +119,8 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 -PHP_RELEASE_VERSION=36 -PHP_EXTRA_VERSION="-dev" +PHP_RELEASE_VERSION=35 +PHP_EXTRA_VERSION="" 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 ee8de7b4e7..f87cc38eda 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 36 +#define PHP_RELEASE_VERSION 35 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.36-dev" -#define PHP_VERSION_ID 50536 +#define PHP_VERSION "5.5.35-dev" +#define PHP_VERSION_ID 50535 |