summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-09-16 14:52:45 +0200
committerJulien Pauli <jpauli@php.net>2014-09-16 14:52:45 +0200
commitf89ee8040a8b8d93981c9df85a79592ceac02f1f (patch)
tree3d41dd6d25c88e8475655b74e2e4619e8ba76241
parente1f52b5af98488442208180cee0d4d6b22eddea3 (diff)
downloadphp-git-PHP-5.5.17.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 7a08622ad9..02006b4e7f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-05 Sep 2014, PHP 5.5.17RC1
+18 Sep 2014, PHP 5.5.17
- Core:
. Fixed bug #47358 (glob returns error, should be empty array()). (Pierre)
diff --git a/configure.in b/configure.in
index d6637d3028..1874b3a6f4 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=17
-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 fffd3305f8..3eaddbfe4f 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 17
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.5.17RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.5.17"
#define PHP_VERSION_ID 50517