summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2006-08-15 13:17:08 +0000
committerIlia Alshanetsky <iliaa@php.net>2006-08-15 13:17:08 +0000
commitb5a9e753ecd94dd07813322cd1dde50f081f9c20 (patch)
tree634497db14ccdb27efcffedffaf256c746328786
parent407caf3a0c260e37985693201cda727a1b0dc128 (diff)
downloadphp-git-b5a9e753ecd94dd07813322cd1dde50f081f9c20.tar.gz
Back to dev
-rw-r--r--NEWS2
-rw-r--r--configure.in4
-rw-r--r--main/php_version.h6
3 files changed, 7 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index eefc926324..3da1c206c6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 2006, PHP 5.1.6
+
17 Aug 2006, PHP 5.1.5
- Fixed memory_limit on 64bit systems. (Stefan E.)
- Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.)
diff --git a/configure.in b/configure.in
index a440a38c0c..9e28b74ad3 100644
--- a/configure.in
+++ b/configure.in
@@ -41,8 +41,8 @@ AC_CONFIG_HEADER(main/php_config.h)
MAJOR_VERSION=5
MINOR_VERSION=1
-RELEASE_VERSION=5
-EXTRA_VERSION=""
+RELEASE_VERSION=6
+EXTRA_VERSION="-dev"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
dnl Define where extension directories are located in the configure context
diff --git a/main/php_version.h b/main/php_version.h
index d51fdb707f..6dedf6ddfb 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,6 +2,6 @@
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 1
-#define PHP_RELEASE_VERSION 5
-#define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "5.1.5"
+#define PHP_RELEASE_VERSION 6
+#define PHP_EXTRA_VERSION "-dev"
+#define PHP_VERSION "5.1.6-dev"