- those are in 5.3.2 now, merge to 5.3.2 section is coming

diff --git a/NEWS b/NEWS
index f82d1f19f76cfb949d5fae32a6216f22f9d620eb..7f5ec902370c7066e299cbd60e556a087ebfb98d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,84 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)
-- Upgraded bundled sqlite to version 3.6.22. (Ilia)
-- Upgraded bundled libmagic to version 5.03. (Mikko)
 
-- Improved LCG entropy. (Rasmus, Samy Kamkar)
-
-- Added libpng 1.4.0 support. (Pierre)
-- Added support for DISABLE_AUTHENTICATOR for imap_open. (Pierre)
-- Added missing host validation for HTTP urls inside FILTER_VALIDATE_URL.
-  (Ilia)
-- Added stream_resolve_include_path(). (Mikko)
 - Added stream filter support to mcrypt extension (ported from 
   mcrypt_filter). (Stas)
 
-- Fixed safe_mode validation inside tempnam() when the directory path does
-  not end with a /). (Martin Jansen)
-- Fixed a possible open_basedir/safe_mode bypass in session extension
-  identified by Grzegorz Stachowiak. (Ilia)
-- Fixed possible crash when a error/warning is raised during php startup.
-  (Pierre)
-- Fixed possible bad behavior of rename on windows when used with symbolic
-  links or invalid paths. (Pierre)
-- Fixed error output to stderr on Windows. (Pierre)
-
-- Fixed bug #50952 (allow underscore _ in constants parsed in php.ini files).
-  (Jani)
-- Fixed bug #50940 (Custom content-length set incorrectly in Apache SAPIs).
-  (Brian France, Rasmus)
-- Fixed bug #50930 (Wrong date by php_date.c patch with ancient gcc/glibc
-  versions). (Derick)
-- Fixed bug #50907 (X-PHP-Originating-Script adding two new lines in *NIX).
-  (Ilia)
-- Fixed bug #50859 (build fails with openssl 1.0 due to md2 deprecation).   
-  (Ilia, hanno at hboeck dot de)
-- Fixed bug #50847 (strip_tags() removes all tags greater then 1023 bytes
-  long). (Ilia)
-- Fixed bug #50829 (php.ini directive pdo_mysql.default_socket is ignored).
-  (Ilia)
-- Fixed bug #50832 (HTTP fopen wrapper does not support passwordless HTTP
-  authentication). (Jani)
-- Fixed bug #50787 (stream_set_write_buffer() has no effect on socket streams).
-  (vnegrier at optilian dot com, Ilia)
-- Fixed bug #50761 (system.multiCall crashes in xmlrpc extension).
-  (hiroaki dot kawai at gmail dot com, Ilia)
-- Fixed bug #50756 (CURLOPT_FTP_SKIP_PASV_IP does not exist). (Sriram)
-- Fixed bug #50732 (exec() adds single byte twice to $output array). (Ilia)
-- Fixed bug #50728 (All PDOExceptions hardcode 'code' property to 0).
-  (Joey, Ilia)
-- Fixed bug #50723 (Bug in garbage collector causes crash). (Dmitry)
-- Fixed bug #50690 (putenv does not set ENV when the value is only one char).
-  (Pierre)
-- Fixed bug #50680 (strtotime() does not support eighth ordinal number). (Ilia)
-- Fixed bug #50661 (DOMDocument::loadXML does not allow UTF-16). (Rob)
-- Fixed bug #50657 (copy() with an empty (zero-byte) HTTP source succeeds but
-  returns false). (Ilia)
-- Fixed bug #50636 (MySQLi_Result sets values before calling constructor).
-  (Pierrick)
-- Fixed bug #50632 (filter_input() does not return default value if the
-  variable does not exist). (Ilia)
-- Fixed bug #50576 (XML_OPTION_SKIP_TAGSTART option has no effect). (Pierrick)
-- Fixed bug #50416 (PROCEDURE db.myproc can't return a result set in the given
-  context). (Andrey)
-- Fixed bug #49585 (date_format buffer not long enough for >4 digit years).
-  (Derick, Adam)
-- Fixed bug #49560 (oci8: using LOBs causes slow PHP shutdown). (Oracle Corp.)
-- Fixed bug #49463 (setAttributeNS fails setting default namespace). (Rob)
-- Fixed bug #48811 (Directives in PATH section do not get applied to
-  sub-directories). (Patch by: ct at swin dot edu dot au)
-- Fixed bug #48590 (SoapClient does not honor max_redirects). (Sriram)
-- Fixed bug #48190 (Content-type parameter "boundary" is not case-insensitive
-  in HTTP uploads). (Ilia)
-- Fixed bug #47409 (extract() problem with array containing word "this").
-  (Ilia, chrisstocktonaz at gmail dot com)
-- Fixed bug #47281 ($php_errormsg is limited in size of characters)
-  (Oracle Corp.)
-- Fixed bug #44827 (define() allows :: in constant names). (Ilia)
-- Fixed bug #44098 (imap_utf8() returns only capital letters).
-  (steffen at dislabs dot de, Pierre)
-
 ?? ??? 20??, PHP 5.3.2
 - Upgraded bundled sqlite to version 3.6.21. (Ilia)
 - Upgraded bundled PCRE to version 8.00. (Scott)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 87a160c252e43ea42ef76a3da0f517199fa99751..5433dc17e094dab9ccc547f4bc140345c91b0ac8 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1607,7 +1607,6 @@ ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC) /* {{{
                }
 #endif
        }
-
        if (module->module_startup_func) {
                EG(current_module) = module;
                if (module->module_startup_func(module->type, module->module_number TSRMLS_CC)==FAILURE) {

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index bb3b0132e14b0cf4a05743dc31ac6be24298462b..38163108456be52c2d27fc21a54197c811110ddc 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov 16 23:30:01 2009 */
+/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:20 2010 */
 #line 1 "Zend/zend_language_scanner.l"
 /*
    +----------------------------------------------------------------------+

diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index b2bce820fdb485523d536e25a081197318e4b44e..020966a853979d74ccc49bd942d490e7f61ce1c6 100644 (file)
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Sep 10 15:34:33 2009 */
+/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:20 2010 */
 #line 3 "Zend/zend_language_scanner_defs.h"
 
 enum YYCONDTYPE {

diff --git a/ext/standard/tests/general_functions/bug49847.phpt b/ext/standard/tests/general_functions/bug49847.phpt
index 8895202d0cbf3e2c384500bd9b87af3970cc6c6a..6312d03c0e24061c4928763ba10494b8ba4e161c 100644 (file)
--- a/ext/standard/tests/general_functions/bug49847.phpt
+++ b/ext/standard/tests/general_functions/bug49847.phpt
@@ -23,3 +23,4 @@ array(1) {
   [0]=>
   string(4098) "%s 1"
 }
+

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index e60144a5b916c30f2836995fa44c61d426604b1c..a497224ea913149eba881f452d5a3907b4f3d5aa 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Nov 23 09:26:17 2009 */
+/* Generated by re2c 0.13.5 on Mon Jan 11 14:20:08 2010 */
 #line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+