iliaa Fri Mar 7 09:03:54 2003 EDT
Modified files:
/php4/ext/ldap ldap.c
Log:
Fixed bug #22585 (Do not terminate the script on minor errors).
Index: php4/ext/ldap/ldap.c
diff -u php4/ext/ldap/ldap.c:1.136 php4/ext/ldap/ldap.c:1.137
--- php4/ext/ldap/ldap.c:1.136 Fri Mar 7 00:15:13 2003
+++ php4/ext/ldap/ldap.c Fri Mar 7 09:03:53 2003
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.136 2003/03/07 05:15:13 sniper Exp $ */
+/* $Id: ldap.c,v 1.137 2003/03/07 14:03:53 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,7 +286,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.136 2003/03/07
05:15:13 sniper Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.137 2003/03/07
14:03:53 iliaa Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
@@ -1292,7 +1292,7 @@
if (zend_hash_get_current_key(Z_ARRVAL_PP(entry), &attribute, &index,
0) == HASH_KEY_IS_STRING) {
ldap_mods[i]->mod_type = estrdup(attribute);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Unknown attribute
in the data");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown attribute
in the data");
/* Free allocated memory */
while (i >= 0) {
efree(ldap_mods[i--]);
@@ -2098,7 +2098,7 @@
RETVAL_STRINGL(ldap_buf, ldap_len, 1);
free(ldap_buf);
} else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Conversion from iso-8859-1
to t61 failed: %s", ldap_err2string(result));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Conversion from
iso-8859-1 to t61 failed: %s", ldap_err2string(result));
RETVAL_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
