summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2015-02-04 16:35:32 +0100
committerJulien Pauli <jpauli@php.net>2015-02-04 16:35:32 +0100
commitb86529f751c277c699f707e2506c0c84f698bc18 (patch)
tree95f30acaa0fcc5a77af808122f646661dab2c511
parentc85f12e3aca8d1da64504018e421a766ab66e574 (diff)
downloadphp-git-b86529f751c277c699f707e2506c0c84f698bc18.tar.gz
5.5.23 now
-rw-r--r--NEWS7
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index d2b70a77c1..4710435718 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2015, PHP 5.5.23
+
+
?? ??? 2015, PHP 5.5.22
- Core:
@@ -24,10 +27,6 @@ PHP NEWS
. Fixed bug #68571 (core dump when webserver close the socket).
(redfoxli069 at gmail dot com, Laruence)
-- JSON:
- . Fixed bug #68938 (json_decode() decodes empty string without error).
- (jeremy at bat-country dot us)
-
- Libxml:
. Fixed bug #64938 (libxml_disable_entity_loader setting is shared
between threads). (Martin Jansen)
diff --git a/configure.in b/configure.in
index d9aa734091..8ba93e7a35 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=5
-PHP_RELEASE_VERSION=22
+PHP_RELEASE_VERSION=23
PHP_EXTRA_VERSION="-dev"
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 7875ad7952..35ee96df2a 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 5
-#define PHP_RELEASE_VERSION 22
+#define PHP_RELEASE_VERSION 23
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.22-dev"
-#define PHP_VERSION_ID 50522
+#define PHP_VERSION "5.5.23-dev"
+#define PHP_VERSION_ID 50523