jani Fri Jul 13 10:55:43 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ldap ldap.c
Log:
- Do not break thousands of scripts.. (will remove in 5.3)
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.8&r2=1.161.2.3.2.9&diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.8
php-src/ext/ldap/ldap.c:1.161.2.3.2.9
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.8 Fri Jul 13 02:00:39 2007
+++ php-src/ext/ldap/ldap.c Fri Jul 13 10:55:43 2007
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.8 2007/07/13 02:00:39 jani Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.9 2007/07/13 10:55:43 jani Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -322,7 +322,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled");
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.8
2007/07/13 02:00:39 jani Exp $");
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.161.2.3.2.9
2007/07/13 10:55:43 jani Exp $");
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -1130,8 +1130,9 @@
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
+ int argc = ZEND_NUM_ARGS();
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link,
&result_entry) == FAILURE) {
+ if ((argc < 2 || argc > 3) || zend_get_parameters_ex(2, &link,
&result_entry) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -1157,8 +1158,9 @@
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
+ int argc = ZEND_NUM_ARGS();
- if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &link,
&result_entry) == FAILURE) {
+ if ((argc < 2 || argc > 3) || zend_get_parameters_ex(2, &link,
&result_entry) == FAILURE) {
WRONG_PARAM_COUNT;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
