summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-07-23 11:00:58 +0200
committerJulien Pauli <jpauli@php.net>2014-07-23 11:00:58 +0200
commitebbb592f6402b45da84c7725bc4131f36ed498b1 (patch)
tree272ec48f12e59f75a0f39d569c75401ed16e9070
parentf4bc3416fd138579326a5a6cb4d1e4407dac2baa (diff)
downloadphp-git-PHP-5.5.15.tar.gz
-rw-r--r--NEWS2
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 1b32b441b3..307c83a546 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-10 Jul 2014, PHP 5.5.15RC1
+24 Jul 2014, PHP 5.5.15
- Core:
. Fixed bug #67428 (header('Location: foo') will override a 308-399 response
diff --git a/configure.in b/configure.in
index 0044429c17..ebecbf92ba 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=15
-PHP_EXTRA_VERSION="RC1"
+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 73e951254c..5c2c1fad71 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 15
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.15RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.15"
#define PHP_VERSION_ID 50515