com php-src: Merge branch 'PHP-5.5': UPGRADING
| From: | Stanislav Malyshev | Date: | Tue, 29 Jan 2013 06:24:56 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.5': UPGRADING | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71051@lists.php.net to get a copy of this message | ||
Commit: 1ca429e1d64a670e292fba64f3f97ea948860549
Author: Stanislav Malyshev <stas@php.net> Mon, 28 Jan 2013 22:24:56 -0800
Parents: ba7544beb2d1fdcfd88e454320d230ca877708fa a9d013bb020591cb6306afa2748da80f68b81f56
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1ca429e1d64a670e292fba64f3f97ea948860549
Log:
Merge branch 'PHP-5.5'
* PHP-5.5:
Implement fix for bug #46439 - add CURLFile class for safer uploads
Conflicts:
UPGRADING
Bugs:
https://bugs.php.net/46439
Changed paths:
MM UPGRADING
Diff:
diff --cc UPGRADING
index 79b855a,8c9b3de..c34101d
--- a/UPGRADING
+++ b/UPGRADING
@@@ -50,7 -264,17 +50,10 @@@ PHP X.Y UPGRADE NOTE
6. New Classes and Interfaces
========================================
-- Intl:
- - IntlCalendar
- - IntlGregorianCalendar
- - IntlTimeZone
- - IntlBreakIterator
- - IntlRuleBasedBreakIterator
- - IntlCodePointBreakIterator
+ - cURL:
+ - CURLFile
+
========================================
7.. Removed Extensions
========================================