PHP 5.3.6

diff --git a/NEWS b/NEWS
index 0d851b8b63a4b9fe8fb951012a2568056950c8f0..e06e59aa4db9ac8b73445e5c1f309ecc1d555c35 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,48 +1,6 @@
-PHP                                                                        NEWS
+PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Mar 2011, PHP 5.3.6
-- Zend Engine:
-  . Fixed bug numerous crashes due to setlocale (crash on error, pcre, mysql
-    etc.) on Windows in thread safe mode. (Pierre)
-  . Fixed bug #54262 (Crash when assigning value to a dimension in a non-array).
-    (Dmitry)
-
-
-- Phar extension:
-  . Fixed bug #54247 (format-string vulnerability on Phar). (Felipe)
-    (CVE-2011-1153)
-
-10 Mar 2011, PHP 5.3.6RC3
-- Shmop extension:
-  . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)
-    Reported by Jose Carlos Norte <jose at eyeos dot org> (CVE-2011-1092)
-
-- SPL extension:
-  . Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance
-    segfaults). (Felipe)
-
-03 Mar 2011, PHP 5.3.6RC2
-- Zend Engine:
-  . Fixed bug #43512 (same parameter name can be used multiple times in
-    method/function definition). (Felipe)
-
-- Exif extension:
-  . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni).
-    (Pierre) (CVE-2011-0708)
-
-- OpenSSL extension:
-  . Fixed bug #54060 (Memory leaks when openssl_encrypt). (Pierre)
-  . Fixed bug #54061 (Memory leaks when openssl_decrypt). (Pierre)
-
-- SPL extension:
-  . Fixed memory leak in DirectoryIterator::getExtension() and 
-    SplFileInfo::getExtension(). (Felipe)
-
-- Tokenizer Extension
-  . Fixed bug #54089 (token_get_all() does not stop after __halt_compiler).
-    (Ilia)
-
-17 Feb 2011, PHP 5.3.6RC1
+17 Mar 2011, PHP 5.3.6
 - Upgraded bundled Sqlite3 to version 3.7.4. (Ilia)
 - Upgraded bundled PCRE to version 8.11. (Ilia)
 
@@ -50,6 +8,8 @@
   . Indirect reference to $this fails to resolve if direct $this is never used
     in method. (Scott)
   . Added options to debug backtrace functions. (Stas)
+  . Fixed bug numerous crashes due to setlocale (crash on error, pcre, mysql
+    etc.) on Windows in thread safe mode. (Pierre)
   . Fixed Bug #53971 (isset() and empty() produce apparently spurious runtime
     error). (Dmitry)
   . Fixed Bug #53958 (Closures can't 'use' shared variables by value and by
@@ -58,6 +18,8 @@
   . Fixed Bug #51458 (Lack of error context with nested exceptions). (Stas)
   . Fixed Bug #47143 (Throwing an exception in a destructor causes a fatal
     error). (Stas)
+  . Fixed bug #43512 (same parameter name can be used multiple times in
+    method/function definition). (Felipe)
 
 - Core:
   . Added ability to connect to HTTPS sites through proxy with basic
@@ -97,6 +59,10 @@
   . Fixed bug #52063 (DateTime constructor's second argument doesn't have a 
     null default value). (Gustavo, Stas)
 
+- Exif extension:
+  . Fixed bug #54002 (crash on crafted tag, reported by Luca Carettoni).
+    (Pierre) (CVE-2011-0708)
+
 - Filter extension:
   . Fixed bug #53924 (FILTER_VALIDATE_URL doesn't validate port number).
     (Ilia, Gustavo)
@@ -151,6 +117,8 @@
 - OpenSSL extension:
   . Fixed stream_socket_enable_crypto() not honoring the socket timeout in
     server mode. (Gustavo)
+  . Fixed bug #54060 (Memory leaks when openssl_encrypt). (Pierre)
+  . Fixed bug #54061 (Memory leaks when openssl_decrypt). (Pierre)
   . Fixed bug #53592 (stream_socket_enable_crypto() busy-waits in client mode).
     (Gustavo)
   . Implemented FR #53447 (Cannot disable SessionTicket extension for servers
@@ -172,6 +140,8 @@
     (gyp at balabit dot hu)
 
 - Phar extension:
+  . Fixed bug #54247 (format-string vulnerability on Phar). (Felipe)
+    (CVE-2011-1153)
   . Fixed bug #53541 (format string bug in ext/phar).
     (crrodriguez at opensuse dot org, Ilia)
   . Fixed bug #53898 (PHAR reports invalid error message, when the directory 
@@ -192,6 +162,10 @@
   . Fixed bug #53915 (ReflectionClass::getConstant(s) emits fatal error on
     constants with self::). (Gustavo)
 
+- Shmop extension:
+  . Fixed bug #54193 (Integer overflow in shmop_read()). (Felipe)
+    Reported by Jose Carlos Norte <jose at eyeos dot org> (CVE-2011-1092)
+
 - SNMP extension:
   . Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree
     correctly). (Boris Lytochkin)
@@ -201,9 +175,14 @@
     (Mateusz Kocielski, Pierre)
 
 - SPL extension:
+  . Fixed memory leak in DirectoryIterator::getExtension() and 
+    SplFileInfo::getExtension(). (Felipe)
   . Fixed bug #53914 (SPL assumes HAVE_GLOB is defined). (Chris Jones)
   . Fixed bug #53515 (property_exists incorrect on ArrayObject null and 0
     values). (Felipe)
+  . Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance
+    segfaults). (Felipe)
+
   . Added SplFileInfo::getExtension(). FR #48767. (Peter Cowburn)
 
 - SQLite3 extension:
@@ -225,6 +204,10 @@
     elements of the returned array before converting them). (Gustavo)
   . Implemented FR #26158 (open arbitrary file descriptor with fopen). (Gustavo)
 
+- Tokenizer Extension
+  . Fixed bug #54089 (token_get_all() does not stop after __halt_compiler).
+    (Ilia)
+
 - XSL extension:
   . Fixed memory leaked introduced by the NULL poisoning patch.
     (Mateusz Kocielski, Pierre)

diff --git a/configure.in b/configure.in
index 792f3e07d82797cd6ed22194ac8241054392287b..23a344cbb5ef1153cdfd69c94bb46f60629f77c1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 PHP_MAJOR_VERSION=5
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=6
-PHP_EXTRA_VERSION="RC3"
+PHP_EXTRA_VERSION=""
 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 fd0dc327619aaa80fc57e48e79b2c26a03f67658..00bd6fad2055f16b05c3496539a56b26fda24876 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 6
-#define PHP_EXTRA_VERSION "RC3"
-#define PHP_VERSION "5.3.6RC3"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.6"
 #define PHP_VERSION_ID 50306