summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2011-01-05 13:39:30 +0000
committerJohannes Schlüter <johannes@php.net>2011-01-05 13:39:30 +0000
commitdf344ea7d659f4e357d8d9315c63d725a0a23f4d (patch)
treefe84eb48a97f2ded0b8cd93668249621cd54cc14
parent02bdb521e2137509bc5a2e6abd4e31e9f14d22bc (diff)
downloadphp-git-df344ea7d659f4e357d8d9315c63d725a0a23f4d.tar.gz
- This will be PHP 5.3.6
-rw-r--r--NEWS6
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h6
3 files changed, 8 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 8cd674e669..acb6e25cbf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 2011, PHP 5.3.5
+?? ??? 2011, PHP 5.3.6
- Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)
- Upgraded bundled PCRE to version 8.11. (Ilia)
@@ -8,7 +8,6 @@
. Indirect reference to $this fails to resolve if direct $this is never used
in method. (Scott)
. Fixed Bug #53629 (memory leak inside highlight_string()). (Hannes, Ilia)
- . Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
- Core:
. Fixed bug #48484 (array_product() always returns 0 for an empty array).
@@ -101,6 +100,9 @@
. Fixed bug #53603 (ZipArchive should quiet stat errors). (brad dot froehle at
gmail dot com, Gustavo)
+?? ??? 2011, PHP 5.3.5
+- Fixed Bug #53632 (infinite loop with x87 fpu). (Scott, Rasmus)
+
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
- Upgraded bundled PCRE to version 8.10. (Ilia)
diff --git a/configure.in b/configure.in
index 73f889bcfc..da14c0e81c 100644
--- a/configure.in
+++ b/configure.in
@@ -41,7 +41,7 @@ AC_CONFIG_HEADER(main/php_config.h)
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=3
-PHP_RELEASE_VERSION=5
+PHP_RELEASE_VERSION=6
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 1bc93bd324..edc09d0698 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 3
-#define PHP_RELEASE_VERSION 5
+#define PHP_RELEASE_VERSION 6
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.5-dev"
-#define PHP_VERSION_ID 50305
+#define PHP_VERSION "5.3.6-dev"
+#define PHP_VERSION_ID 50306