summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Pauli <jpauli@php.net>2016-06-21 13:10:37 +0200
committerJulien Pauli <jpauli@php.net>2016-06-21 13:10:37 +0200
commit155619184f5e427797c300d6fe0c01ddcfe5fadc (patch)
treec7e04d18932c126d704a91e5662787dd903633b6
parent0c7250f260303061425d0d8a348d1a80fa0cc12e (diff)
downloadphp-git-155619184f5e427797c300d6fe0c01ddcfe5fadc.tar.gz
5.5.38 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 11ba902041..b7d514b05a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,11 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
** PHP 5.5 is in security-only mode , please do not commit to this branch **
-?? ?? 2016, PHP 5.5.37
+?? ?? 2016, PHP 5.5.38
+
+
+
+23 Jun 2016, PHP 5.5.37
- Core:
. Fixed bug #72268 (Integer Overflow in nl2br()). (Stas)
diff --git a/configure.in b/configure.in
index 96d04bef0d..d98ad00574 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=37
+PHP_RELEASE_VERSION=38
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 4000601799..e85d525365 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 37
+#define PHP_RELEASE_VERSION 38
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.5.37-dev"
-#define PHP_VERSION_ID 50537
+#define PHP_VERSION "5.5.38-dev"
+#define PHP_VERSION_ID 50538