summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2014-09-03 10:18:51 +0200
committerJulien Pauli <jpauli@php.net>2014-09-03 10:18:51 +0200
commit9266227402f50e1ad9953952b68a5ff3a25806b0 (patch)
tree69259eef38f05a393884b4918b11bb7fdd40ac00
parent72c9b0e12b55433b892b82ff74aeba90840c8cb0 (diff)
downloadphp-git-9266227402f50e1ad9953952b68a5ff3a25806b0.tar.gz
5.5.18 now
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 3b7a382038..de02064a47 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2014, PHP 5.5.17
+?? ??? 2014, PHP 5.5.18
+
+
+
+11 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 a6eb3a5faf..dff05e54b4 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=17
+PHP_RELEASE_VERSION=18
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 ec355c3387..e7478d5ce6 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 17
+#define PHP_RELEASE_VERSION 18
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.17-dev"
-#define PHP_VERSION_ID 50517
+#define PHP_VERSION "5.5.18-dev"
+#define PHP_VERSION_ID 50518