summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyra3l@gmail.com>2016-09-01 20:37:33 +0200
committerFerenc Kovacs <tyra3l@gmail.com>2016-09-01 20:37:33 +0200
commitb0269468ea767cafa9d700a0dc0c2b38dca9c2ee (patch)
treeb7d60024042bd899f263d6e1b57b154714c6bad8
parentb2d267d9ee034fa6b502901caa9a81bcc2212755 (diff)
downloadphp-git-b0269468ea767cafa9d700a0dc0c2b38dca9c2ee.tar.gz
PHP-5.6.26RC1php-5.6.26RC1
-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 454c97da4a..1b591f9412 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2016, PHP 5.6.26
+01 Sep 2016, PHP 5.6.26RC1
- Core:
. Fixed bug #72907 (null pointer deref, segfault in gc_remove_zval_from_buffer
@@ -14,9 +14,6 @@ PHP NEWS
. Fixed bug #70825 (Cannot fetch multiple values with group in ini file).
(cmb)
-- Streams:
- . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence)
-
- FTP:
. Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with
require_ssl_reuse). (Benedict Singer)
@@ -54,6 +51,9 @@ PHP NEWS
. Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).
(cmb)
+- Streams:
+ . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence)
+
- XML:
. Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb)
diff --git a/configure.in b/configure.in
index be79a02231..79a9d479ad 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=26
-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 8fa4040c5e..73784bde23 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 26
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.6.26-dev"
+#define PHP_EXTRA_VERSION "RC1"
+#define PHP_VERSION "5.6.26RC1"
#define PHP_VERSION_ID 50626