svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/ldap/ldap.c trunk/ext/ldap/ldap.c
| From: | Ilia Alshanetsky | Date: | Sun, 30 Aug 2009 15:33:59 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/ldap/ldap.c trunk/ext/ldap/ldap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60268@lists.php.net to get a copy of this message | ||
iliaa Sun, 30 Aug 2009 15:33:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287897
Log:
Bug #49391 ldap.c utilizing deprecated ldap_modify_s
Bug: http://bugs.php.net/49391 (Open) ldap.c utilizing
deprecated ldap_modify_s
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
U php/php-src/trunk/ext/ldap/ldap.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-30 12:19:50 UTC (rev 287896)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-30 15:33:59 UTC (rev 287897)
@@ -27,6 +27,7 @@
- Fixed memory leak in stream_is_local(). (Felipe, Tony)
- Fixed BC break in mime_content_type(), removes the content encoding. (Scott)
+- Fixed bug #49391 (ldap.c utilizing deprecated ldap_modify_s). (Ilia)
- Fixed bug #49372 (segfault in php_curl_option_curl). (Pierre)
- Fixed bug #49306 (inside pdo_mysql default socket settings are ignored).
(Ilia)
Modified: php/php-src/branches/PHP_5_3/ext/ldap/ldap.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/ldap/ldap.c 2009-08-30 12:19:50 UTC (rev 287896)
+++ php/php-src/branches/PHP_5_3/ext/ldap/ldap.c 2009-08-30 15:33:59 UTC (rev 287897)
@@ -1350,7 +1350,7 @@
RETVAL_FALSE;
} else RETVAL_TRUE;
} else {
- if ((i = ldap_modify_s(ld->link, dn, ldap_mods)) != LDAP_SUCCESS) {
+ if ((i = ldap_modify_ext_s(ld->link, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modify: %s", ldap_err2string(i));
RETVAL_FALSE;
} else RETVAL_TRUE;
Modified: php/php-src/trunk/ext/ldap/ldap.c
===================================================================
--- php/php-src/trunk/ext/ldap/ldap.c 2009-08-30 12:19:50 UTC (rev 287896)
+++ php/php-src/trunk/ext/ldap/ldap.c 2009-08-30 15:33:59 UTC (rev 287897)
@@ -1380,7 +1380,7 @@
RETVAL_FALSE;
} else RETVAL_TRUE;
} else {
- if ((i = ldap_modify_s(ld->link, dn, ldap_mods)) != LDAP_SUCCESS) {
+ if ((i = ldap_modify_ext_s(ld->link, dn, ldap_mods, NULL, NULL)) != LDAP_SUCCESS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Modify: %s", ldap_err2string(i));
RETVAL_FALSE;
} else RETVAL_TRUE;