diff options
| author | Julien Pauli <jpauli@php.net> | 2015-06-09 10:11:35 +0200 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-06-09 10:11:35 +0200 |
| commit | 68dec50c30f5352790dcee65c7989de9b86b210e (patch) | |
| tree | 8fc0739d3e6ed14055d995cd186a3d23bcc5c127 | |
| parent | a2b7a0d7a3c47997a0fc53fd22fca28bf0a299ca (diff) | |
| download | php-git-68dec50c30f5352790dcee65c7989de9b86b210e.tar.gz | |
5.5.26
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | main/php_version.h | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -1,6 +1,6 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -28 May 2015, PHP 5.5.26RC1 +11 Jun 2015, PHP 5.5.26 - Core: . Fixed bug #69566 (Conditional jump or move depends on uninitialised value @@ -35,6 +35,10 @@ PHP NEWS . Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF). (Laruence, Dmitry) +- Sqlite3: + . Upgrade bundled sqlite to 3.8.10.2. (CVE-2015-3414, CVE-2015-3415, + CVE-2015-3416) (Kaplan) + 14 May 2015, PHP 5.5.25 - Core: diff --git a/configure.in b/configure.in index fdd2689f21..59ce54ced2 100644 --- a/configure.in +++ b/configure.in @@ -120,7 +120,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=5 PHP_MINOR_VERSION=5 PHP_RELEASE_VERSION=26 -PHP_EXTRA_VERSION="RC1" +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 36ef154741..6978382fa8 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 26 -#define PHP_EXTRA_VERSION "RC1" -#define PHP_VERSION "5.5.26RC1" +#define PHP_EXTRA_VERSION "" +#define PHP_VERSION "5.5.26" #define PHP_VERSION_ID 50526 |