diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-03-17 17:08:28 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-03-17 17:09:47 -0700 |
| commit | 890b3987ab55ede805d2d7703d1da46facc63819 (patch) | |
| tree | 80ad04ad37b084e8720a3c0099c5bfae29d45ea6 /main | |
| parent | dbd1d79b68f443b3d13da3571f6f70ae3fbc0aa3 (diff) | |
| parent | c83dd84ad6797dbf4308a451873597ac337e4b96 (diff) | |
| download | php-git-890b3987ab55ede805d2d7703d1da46facc63819.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69248 - heap overflow vulnerability in regcomp.c
add test for bug #68976
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/php_version.h b/main/php_version.h index 959e7cebf6..ed1e351fda 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 6 -#define PHP_RELEASE_VERSION 8 +#define PHP_RELEASE_VERSION 6 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.6.8-dev" -#define PHP_VERSION_ID 50608 +#define PHP_VERSION "5.6.6-dev" +#define PHP_VERSION_ID 50606 |