com php-src: prepare for 5.5.29: NEWS configure.in main/php_v ersion.h
| From: | JulienPauli | Date: | Wed, 02 Sep 2015 15:39:30 +0000 |
| Subject: | com php-src: prepare for 5.5.29: NEWS configure.in main/php_v ersion.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88867@lists.php.net to get a copy of this message | ||
Commit: 58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d
Author: Julien Pauli <jpauli@php.net> Wed, 2 Sep 2015 17:39:30 +0200
Parents: 43c2dfa7b3c0e42ddd8f181200ea34bdb7b8cfd0
Branches: PHP-5.5.29
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=58b8d9d27eb2bcdf5de2197bbd80949c05ecb88d
Log:
prepare for 5.5.29
Changed paths:
M NEWS
M configure.in
M main/php_version.h
Diff:
diff --git a/NEWS b/NEWS
index a8b3a82..005f62c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,5 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2015, PHP 5.5.30
-
-** PHP 5.5 is in security-only mode , please do not commit to this branch **
-
03 Sep 2015, PHP 5.5.29
- Core:
diff --git a/configure.in b/configure.in
index a171d11..fb32bcf 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=29
-PHP_EXTRA_VERSION="-dev"
+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 8da8c05..66555c9 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 29
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.29-dev"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.29"
#define PHP_VERSION_ID 50529