com php-src: 5.5.31 now: NEWS configure.in main/php_version .h
| From: | JulienPauli | Date: | Wed, 30 Sep 2015 11:01:11 +0000 |
| Subject: | com php-src: 5.5.31 now: NEWS configure.in main/php_version .h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89243@lists.php.net to get a copy of this message | ||
Commit: 3f08fc0466a2acd38763b23f85e06eb02950c6ea
Author: Julien Pauli <jpauli@php.net> Wed, 30 Sep 2015 13:01:11 +0200
Parents: 932f70717717ed7b338e0f5e7b5cd99c7afab1e1
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3f08fc0466a2acd38763b23f85e06eb02950c6ea
Log:
5.5.31 now
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index fbe94ee..d5b5016 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
** PHP 5.5 is in security-only mode , please do not commit to this branch **
-?? ??? 2015, PHP 5.5.30
+?? ??? 2015, PHP 5.5.31
+
+01 Oct 2015, PHP 5.5.30
- Phar:
. Fixed bug #69720 (Null pointer dereference in phar_get_fp_offset()). (Stas)
diff --git a/configure.in b/configure.in
index b8675ad..6dcfdf4 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=30
+PHP_RELEASE_VERSION=31
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 2128d74..02dab19 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 30
+#define PHP_RELEASE_VERSION 31
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.30-dev"
-#define PHP_VERSION_ID 50530
+#define PHP_VERSION "5.5.31-dev"
+#define PHP_VERSION_ID 50531