pajoye                                   Wed, 24 Feb 2010 19:57:56 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=295476

Log:
- merge/update/fix

Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3_2/NEWS

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2010-02-24 18:00:01 UTC (rev 295475)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-02-24 19:57:56 UTC (rev 295476)
@@ -3,18 +3,10 @@
 ?? ??? 20??, PHP 5.3.3
 - Upgraded bundled PCRE to version 8.01. (Ilia)

-- Improved crypt support for edge cases (UFC compatibility). (Solar Designer,
-  Joey, Pierre)
-
 - Added stream filter support to mcrypt extension (ported from
   mcrypt_filter). (Stas)

-- Fixed crypt's blowfish sanity check of the "setting" string, to reject 
iteration
-  counts encoded as 36 through 39. (Pierre)
-
-- Fixed #51059 (crypt crashes when invalid salt are given). (Pierre)

-
 ?? ??? 20??, PHP 5.3.2
 - Upgraded bundled sqlite to version 3.6.22. (Ilia)
 - Upgraded bundled libmagic to version 5.03. (Mikko)
@@ -50,8 +42,12 @@
   (Linus Nielsen Feltzing <li...@haxx.se>)
 - Added client-side server name indication support in openssl. (Arnaud)

+- Improved crypt support for edge cases (UFC compatibility). (Solar Designer,
+  Joey, Pierre)
 - Improved fix for bug #50006 (Segfault caused by uksort()). (Stas)

+- Fixed crypt's blowfish sanity check of the "setting" string, to reject 
iteration
+  counts encoded as 36 through 39. (Solar Designer, Joey, Pierre)
 - Fixed mysqlnd hang when queries exactly 16777214 bytes long are sent. 
(Andrey)
 - Fixed incorrect decoding of 5-byte BIT sequences in mysqlnd. (Andrey)
 - Fixed error_log() to be binary safe when using message_type 3. (Jani)
@@ -73,6 +69,7 @@
 - Fixed memory leak in the realpath cache on Windows. (Pierre)
 - Fixed memory leak in zip_close. (Pierre)

+- Fixed #51059 (crypt crashes when invalid salt are given). (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).

Modified: php/php-src/branches/PHP_5_3_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3_2/NEWS 2010-02-24 18:00:01 UTC (rev 295475)
+++ php/php-src/branches/PHP_5_3_2/NEWS 2010-02-24 19:57:56 UTC (rev 295476)
@@ -6,8 +6,10 @@
 23 Feb 2010, PHP 5.3.2 RC 3
 - Improved crypt support for edge cases (UFC compatibility). (Solar Designer,
   Joey, Pierre)
-- Fixed crypt's blowfish sanity check of the "setting" string, to reject
-  iteration counts encoded as 36 through 39. (Pierre)
+
+- Fixed crypt's blowfish sanity check of the "setting" string, to reject 
iteration
+  counts encoded as 36 through 39. (Solar Designer, Joey, Pierre)
+
 - Fixed #51059 (crypt crashes when invalid salt are given). (Pierre)

 12 Feb 2010, PHP 5.3.2 RC 2

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to