summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-04-15 17:57:27 +0200
committerJulien Pauli <jpauli@php.net>2014-04-15 17:57:27 +0200
commitb8d029435dd436487a455a758e8dc10d1c94096e (patch)
tree20c00dad447c117ba2421feeeadc3ac5898ce9e0
parentb72793459124f6325bbfa26562697e3e03e63c2b (diff)
downloadphp-git-b8d029435dd436487a455a758e8dc10d1c94096e.tar.gz
5.5.12RC1 setup
-rw-r--r--NEWS5
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 0c155d85e8..fbc0769c21 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2014, PHP 5.5.13
+
+
?? ??? 2014, PHP 5.5.12
- Core:
. Fixed bug #61019 (Out of memory on command stream_get_contents). (Mike)
@@ -62,7 +65,7 @@ PHP NEWS
(APR issue https://issues.apache.org/bugzilla/show_bug.cgi?id=56120).
(Jeff Trawick)
-?? ??? 2014, PHP 5.5.11
+03 Apr 2014, PHP 5.5.11
- Core:
. Allow zero length comparison in substr_compare() (Tjerk)
diff --git a/configure.in b/configure.in
index 81fed3e085..445df76ed2 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=5
-PHP_RELEASE_VERSION=12
+PHP_RELEASE_VERSION=13
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 08058032fc..4574767493 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 12
+#define PHP_RELEASE_VERSION 13
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.12-dev"
-#define PHP_VERSION_ID 50512
+#define PHP_VERSION "5.5.13-dev"
+#define PHP_VERSION_ID 50513