summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2012-07-13 00:17:37 +0200
committerJohannes Schlüter <johannes@php.net>2012-07-13 00:17:37 +0200
commitc180a72112d59ea4a9aa974dec210420862af465 (patch)
tree3e139232a829dad401dfe9d284278ef431839d5e
parent1f6c43f0555038056c123945e6600c3a18ac2407 (diff)
downloadphp-git-PHP-5.3.15.tar.gz
-rw-r--r--NEWS13
-rw-r--r--configure.in2
-rw-r--r--main/php_version.h4
3 files changed, 12 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 1f64cc045f..88bdc0dfaa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-05 Jul 2012, PHP 5.3.15RC1
+19 Jul 2012, PHP 5.3.15
+
- Zend Engine:
. Fixed bug #51094 (parse_ini_file() with INI_SCANNER_RAW cuts a value that
includes a semi-colon). (Pierrick)
@@ -9,8 +10,8 @@ PHP NEWS
. Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
- Core:
- . Fixed potential overflow in _php_stream_scandir. (Jason Powell,
- Stas)
+ . Fixed potential overflow in _php_stream_scandir, CVE-2012-2688. (Jason
+ Powell, Stas)
. Fixed bug #62432 (ReflectionMethod random corrupt memory on high
concurrent). (Johannes)
. Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed
@@ -44,7 +45,7 @@ PHP NEWS
. Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
- JSON:
- . Improved error handling. (Nikita Popov)
+ . Reverted fix for bug #61537. (Johannes)
- Phar:
. Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
@@ -59,6 +60,10 @@ PHP NEWS
. Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
(Nikita Popov)
+- SQLite:
+ . Fixed open_basedir bypass, CVE-2012-3365. (Johannes, reported by Yury
+ Maryshev)
+
- XML Writer:
. Fixed bug #62064 (memory leak in the XML Writer module).
(jean-pierre dot lozi at lip6 dot fr)
diff --git a/configure.in b/configure.in
index c98260de6c..3e568b3afc 100644
--- 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=15
-PHP_EXTRA_VERSION="RC1"
+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 103caba3d3..b69df58211 100644
--- 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 15
-#define PHP_EXTRA_VERSION "RC1"
-#define PHP_VERSION "5.3.15RC1"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "5.3.15"
#define PHP_VERSION_ID 50315