com php-src: Merge branch 'pull-request/571' into PHP-5.4: NEWS UPGRADING
| From: | Stanislav Malyshev | Date: | Sun, 26 Jan 2014 05:59:57 +0000 |
| Subject: | com php-src: Merge branch 'pull-request/571' into PHP-5.4: NEWS UPGRADING | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75790@lists.php.net to get a copy of this message | ||
Commit: 0742de587a919aefed2346c0c6e4784b71503d36
Author: Stanislav Malyshev <stas@php.net> Sat, 25 Jan 2014 21:57:56 -0800
Parents: fb16bff2ba6a739283b5be350b668f5061a90dad c0e34299042680da16b2ad800b5f8c1a6a009f48
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0742de587a919aefed2346c0c6e4784b71503d36
Log:
Merge branch 'pull-request/571' into PHP-5.4
* pull-request/571:
Implement ldap_modify_batch.
Changed paths:
MM NEWS
MM UPGRADING
Diff:
diff --cc NEWS
index a76000f,a76000f..a1465f6
--- a/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,10 @@@ PH
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2013, PHP 5.4.26
++- LDAP:
++ . Implemented ldap_modify_batch (https://wiki.php.net/rfc/ldap_modify_batch).
++ (Ondřej Hošek)
++
?? ??? 2013, PHP 5.4.25
- Core:
@@@ -9,7 -9,7 +13,7 @@@
. Fixed bug #66509 (copy() arginfo has changed starting from 5.4).
(Will Fitch)
--- mysqlnd
++- mysqlnd:
. Fixed bug #66283 (Segmentation fault after memory_limit). (Johannes)
- PDO_pgsql:
diff --cc UPGRADING
index e6f582a,e6f582a..b484f94
--- a/UPGRADING
+++ b/UPGRADING
@@@ -621,6 -621,6 +621,7 @@@ c. New function
- LDAP:
- ldap_control_paged_result()
- ldap_control_paged_result_response()
++ - ldap_modify_batch (5.4.26)
- libxml:
- libxml_set_external_entity_loader()