This wil be PHP 5.3.16

3 files changed, 8 insertions, 67 deletions

diff --git a/NEWS b/NEWS
index c650c85ab8..782bb62a33 100644
--- a/NEWS
+++ b/NEWS
@@ -1,69 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? 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)
-
-- COM:
-  . Fixed bug #62146 com_dotnet cannot be built shared. (Johannes)
-
-- Core:
-  . Fixed potential overflow in _php_stream_scandir. (Jason Powell,
-    Stas)
-  . Fixed bug #62432 (ReflectionMethod random corrupt memory on high
-    concurrent). (Johannes)
-  . Fixed bug #62443 (Crypt SHA256/512 Segfaults With Malformed 
-    Salt). (Anthony Ferrara)
-
-- Fileinfo:
-  . Fixed magic file regex support. (Felipe)
-
-- FPM:
-  . Fixed bug #61045 (fpm don't send error log to fastcgi clients). (fat)
-  . Fixed bug #61835 (php-fpm is not allowed to run as root). (fat)
-  . Fixed bug #61295 (php-fpm should not fail with commented 'user'
-    for non-root start). (fat)
-  . Fixed bug #61026 (FPM pools can listen on the same address). (fat)
-  . Fixed bug #62033 (php-fpm exits with status 0 on some failures to start).
-    (fat)
-  . Fixed bug #62153 (when using unix sockets, multiples FPM instances
-    can be launched without errors). (fat)
-  . Fixed bug #62160 (Add process.priority to set nice(2) priorities). (fat)
-  . Fixed bug #61218 (FPM drops connection while receiving some binary values
-    in FastCGI requests). (fat)
-  . Fixed bug #62205 (php-fpm segfaults (null passed to strstr)). (fat)
+?? ??? 2012, PHP 5.3.16
 
-- Intl:
-  . Fixed bug #62083 (grapheme_extract() memory leaks). (Gustavo)
-  . Fixed bug #62081 (IntlDateFormatter constructor leaks memory when called
-    twice). (Gustavo)
-  . Fixed bug #62070 (Collator::getSortKey() returns garbage). (Gustavo)
-  . Fixed bug #62017 (datefmt_create with incorrectly encoded timezone leaks
-    pattern). (Gustavo)
-  . Fixed bug #60785 (memory leak in IntlDateFormatter constructor). (Gustavo)
-
-- JSON:
-  . Improved error handling. (Nikita Popov)
-
-- Phar:
-  . Fixed bug #62227 (Invalid phar stream path causes crash). (Felipe)
-
-- Reflection:
-  . Fixed bug #62384 (Attempting to invoke a Closure more than once causes 
-    segfault). (Felipe)
-  . Fixed bug #62202 (ReflectionParameter::getDefaultValue() memory leaks 
-    with constant). (Laruence)
-
-- SPL:
-  . Fixed bug #62262 (RecursiveArrayIterator does not implement Countable).
-    (Nikita Popov)
-
-- XML Writer:
-  . Fixed bug #62064 (memory leak in the XML Writer module). 
-    (jean-pierre dot lozi at lip6 dot fr)
-- Zip:
-  . Upgraded libzip to 0.10.1 (Anatoliy)
+?? ??? 2012, PHP 5.3.15
+  (NEWS will be merged after release by johannes. Formerging changes to the  
+  PHP-5.3.15 release branch talk to johannes)
 
 14 Jun 2012, PHP 5.3.14
 
diff --git a/configure.in b/configure.in
index 6d24249d78..fa6c55769e 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=15
+PHP_RELEASE_VERSION=16
 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 2f65dbdb29..3107a2808a 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 15
+#define PHP_RELEASE_VERSION 16
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.15-dev"
-#define PHP_VERSION_ID 50315
+#define PHP_VERSION "5.3.16-dev"
+#define PHP_VERSION_ID 50316