From: Stanislav Malyshev <stas@php.net>
Date: Wed, 18 Mar 2015 00:08:28 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=890b3987ab55ede805d2d7703d1da46facc63819;p=php

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
---

890b3987ab55ede805d2d7703d1da46facc63819
diff --cc NEWS
index a047cada8e,d8c965fad4..c0e2e04a65
--- a/NEWS
+++ b/NEWS
@@@ -19,8 -21,11 +19,11 @@@ PH
    . Fixed bug #65406 (Enchant broker plugins are in the wrong place in windows
      builds). (Anatol)
  
+ - Ereg:
+   . Fixed bug #69248 (heap overflow vulnerability in regcomp.c). (Stas)
+ 
  - Filter:
 -  . Fixed bug #69202 (FILTER_FLAG_STRIP_BACKTICK ignored unless other
 +  . Fixed bug #69202: (FILTER_FLAG_STRIP_BACKTICK ignored unless other
      flags are used). (Jeff Welch)
    . Fixed bug #69203 (FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127). (Jeff
      Welch)
diff --cc main/php_version.h
index 959e7cebf6,2997684bf0..ed1e351fda
--- a/main/php_version.h
+++ b/main/php_version.h
@@@ -1,8 -1,8 +1,8 @@@
  /* automatically generated by configure */
  /* edit configure.in to change version number */
  #define PHP_MAJOR_VERSION 5
 -#define PHP_MINOR_VERSION 5
 -#define PHP_RELEASE_VERSION 24
 +#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.5.24-dev"
 -#define PHP_VERSION_ID 50524
++#define PHP_VERSION "5.6.6-dev"
++#define PHP_VERSION_ID 50606