summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2016-01-21 02:24:05 +0100
committerFerenc Kovacs <tyrael@php.net>2016-01-21 02:24:05 +0100
commitb2d5666d946c6881c1a73810c03fadf2c893c720 (patch)
tree0f58136120c6e47f5bd03cbb1ada4d08827b8441
parent3c8f287d5837f357605184cccd004de017b9f5b4 (diff)
downloadphp-git-b2d5666d946c6881c1a73810c03fadf2c893c720.tar.gz
prepare 5.6.18RC1php-5.6.18RC1
-rw-r--r--NEWS8
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index e02cde1edd..5fdf9a92fb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.18
-
-- Apache2handler:
- . Fix >2G Content-Length headers in apache2handler. (Adam Harvey)
+21 Jan 2016, PHP 5.6.18RC1
- Core:
. Fixed bug #71201 (round() segfault on 64-bit builds). (Anatol)
@@ -12,6 +9,9 @@ PHP NEWS
. Fixed bug #71273 (A wrong ext directory setup in php.ini leads to crash).
(Anatol);
+- Apache2handler:
+ . Fix >2G Content-Length headers in apache2handler. (Adam Harvey)
+
- FTP:
. Implemented FR #55651 (Option to ignore the returned FTP PASV address).
(abrender at elitehosts dot com)
diff --git a/configure.in b/configure.in
index 9cfe902c3c..61e5fb5cfd 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=6
PHP_RELEASE_VERSION=18
-PHP_EXTRA_VERSION="-dev"
+PHP_EXTRA_VERSION="RC1"
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 8391fdb35e..270bfd0634 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 6
#define PHP_RELEASE_VERSION 18
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.18-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.18RC1"
#define PHP_VERSION_ID 50618