[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap/tests ldap_explode_dn.phpt
cardoe Tue Dec 11 17:19:48 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/ldap/tests ldap_explode_dn.phpt Log: Adding initial tests for LDAP module. Adding tests for ldap_explode_dn() function http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?view=markuprev=1.1 Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt +++ php-src/ext/ldap/tests/ldap_explode_dn.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap ldap_explode_dn.phpt
cardoe Tue Dec 11 17:20:58 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/ldap ldap_explode_dn.phpt Log: Adding initial tests for LDAP module. Adding tests for ldap_explode_dn() function http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap_explode_dn.phpt?view=markuprev=1.1 Index: php-src/ext/ldap/ldap_explode_dn.phpt +++ php-src/ext/ldap/ldap_explode_dn.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap_explode_dn.phpt
cardoe Tue Dec 11 17:21:51 2007 UTC
Modified files:
/php-src/ext/ldap ldap_explode_dn.phpt
Log:
Adding initial tests for LDAP module. Adding tests for ldap_explode_dn()
function
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap_explode_dn.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/ldap/ldap_explode_dn.phpt
diff -u /dev/null php-src/ext/ldap/ldap_explode_dn.phpt:1.2
--- /dev/null Tue Dec 11 17:21:51 2007
+++ php-src/ext/ldap/ldap_explode_dn.phpt Tue Dec 11 17:21:51 2007
@@ -0,0 +1,68 @@
+--TEST--
+ldap_explode_dn() test
+--FILE--
+?php
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+
+var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 1));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+
+echo Done\n;
+
+?
+--EXPECT--
+array(4) {
+ [count]=
+ int(3)
+ [0]=
+ string(6) cn=bob
+ [1]=
+ string(10) dc=example
+ [2]=
+ string(6) dc=com
+}
+array(5) {
+ [count]=
+ int(4)
+ [0]=
+ string(6) cn=bob
+ [1]=
+ string(8) ou=users
+ [2]=
+ string(10) dc=example
+ [3]=
+ string(6) dc=com
+}
+array(4) {
+ [count]=
+ int(3)
+ [0]=
+ string(3) bob
+ [1]=
+ string(7) example
+ [2]=
+ string(3) com
+}
+array(5) {
+ [count]=
+ int(4)
+ [0]=
+ string(3) bob
+ [1]=
+ string(5) users
+ [2]=
+ string(7) example
+ [3]=
+ string(3) com
+}
+bool(false)
+bool(false)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap ldap_explode_dn.phpt /ext/ldap/tests ldap_explode_dn.phpt
cardoe Tue Dec 11 17:30:58 2007 UTC
Removed files:
/php-src/ext/ldap ldap_explode_dn.phpt
Modified files:
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
put ldap_explode_dn.phpt in proper directory
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u /dev/null php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.2
--- /dev/null Tue Dec 11 17:30:58 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Dec 11 17:30:58 2007
@@ -0,0 +1,68 @@
+--TEST--
+ldap_explode_dn() test
+--FILE--
+?php
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+
+var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 1));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+
+var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+
+echo Done\n;
+
+?
+--EXPECT--
+array(4) {
+ [count]=
+ int(3)
+ [0]=
+ string(6) cn=bob
+ [1]=
+ string(10) dc=example
+ [2]=
+ string(6) dc=com
+}
+array(5) {
+ [count]=
+ int(4)
+ [0]=
+ string(6) cn=bob
+ [1]=
+ string(8) ou=users
+ [2]=
+ string(10) dc=example
+ [3]=
+ string(6) dc=com
+}
+array(4) {
+ [count]=
+ int(3)
+ [0]=
+ string(3) bob
+ [1]=
+ string(7) example
+ [2]=
+ string(3) com
+}
+array(5) {
+ [count]=
+ int(4)
+ [0]=
+ string(3) bob
+ [1]=
+ string(5) users
+ [2]=
+ string(7) example
+ [3]=
+ string(3) com
+}
+bool(false)
+bool(false)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap/tests ldap_explode_dn.phpt skipif.inc
cardoe Tue Dec 11 17:33:10 2007 UTC
Added files:
/php-src/ext/ldap/tests skipif.inc
Modified files:
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
add skipif case if the ldap extension is not loaded
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.2
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.2 Tue Dec 11 17:30:58 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Dec 11 17:33:10 2007
@@ -1,5 +1,7 @@
--TEST--
ldap_explode_dn() test
+--SKIPIF--
+?php require_once('skipif.inc'); ?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/ldap/tests/skipif.inc
+++ php-src/ext/ldap/tests/skipif.inc
?php
if (!extension_loaded('ldap')){
die('skip ldap extension not available');
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap ldap_explode_dn.phpt /ext/ldap/tests ldap_explode_dn.phpt
cardoe Tue Dec 11 17:33:51 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/ldap/tests ldap_explode_dn.phpt Removed files: /php-src/ext/ldap ldap_explode_dn.phpt Log: put ldap_explode_dn.phpt in proper directory http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?view=markuprev=1.1 Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt +++ php-src/ext/ldap/tests/ldap_explode_dn.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap/tests ldap_explode_dn.phpt skipif.inc
cardoe Tue Dec 11 17:35:11 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/ldap/tests skipif.inc
Modified files:
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
add skipif case if the ldap extension is not loaded
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.3.2.2r2=1.3.2.3diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.2
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.3
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.2 Tue Dec 11 17:33:51 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Dec 11 17:35:11 2007
@@ -1,5 +1,7 @@
--TEST--
ldap_explode_dn() test
+--SKIPIF--
+?php require_once('skipif.inc'); ?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/ldap/tests/skipif.inc
+++ php-src/ext/ldap/tests/skipif.inc
?php
if (!extension_loaded('ldap')){
die('skip ldap extension not available');
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap/tests ldap_explode_dn.phpt skipif.inc
cardoe Tue Dec 11 17:36:03 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/ldap/tests skipif.inc
Modified files:
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
add skipif case if the ldap extension is not loaded
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.1
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.2
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.1 Tue Dec 11 17:19:47 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Tue Dec 11 17:36:03 2007
@@ -1,5 +1,7 @@
--TEST--
ldap_explode_dn() test
+--SKIPIF--
+?php require_once('skipif.inc'); ?
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/ldap/tests/skipif.inc
+++ php-src/ext/ldap/tests/skipif.inc
?php
if (!extension_loaded('ldap')){
die('skip ldap extension not available');
}
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap/tests ldap_explode_dn.phpt
cardoe Thu Dec 13 17:45:44 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
expand ldap_explode_dn() tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.2
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.3
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.1.2.2 Tue Dec 11 17:36:03 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Thu Dec 13 17:45:44 2007
@@ -5,22 +5,40 @@
--FILE--
?php
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 0));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 1));
+/* Explode with attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode without attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Too few parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com);
+
+/* Too many parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com, 1, 1);
+
+/* Bad DN value with attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 0));
+
+/* Bad DN value without attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 1));
+
echo Done\n;
?
---EXPECT--
+--EXPECTF--
array(4) {
[count]=
int(3)
@@ -67,4 +85,10 @@
}
bool(false)
bool(false)
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+bool(false)
+bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap/tests ldap_explode_dn.phpt
cardoe Thu Dec 13 17:46:23 2007 UTC
Modified files:
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
expand ldap_explode_dn() tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.4
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3 Tue Dec 11 17:33:10 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Thu Dec 13 17:46:23 2007
@@ -5,22 +5,40 @@
--FILE--
?php
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 0));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 1));
+/* Explode with attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode without attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Too few parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com);
+
+/* Too many parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com, 1, 1);
+
+/* Bad DN value with attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 0));
+
+/* Bad DN value without attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 1));
+
echo Done\n;
?
---EXPECT--
+--EXPECTF--
array(4) {
[count]=
int(3)
@@ -67,4 +85,10 @@
}
bool(false)
bool(false)
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+bool(false)
+bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap/tests ldap_explode_dn.phpt
cardoe Thu Dec 13 17:46:46 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ldap/tests ldap_explode_dn.phpt
Log:
expand ldap_explode_dn() tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_explode_dn.phpt?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/ldap/tests/ldap_explode_dn.phpt
diff -u php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.3
php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.4
--- php-src/ext/ldap/tests/ldap_explode_dn.phpt:1.3.2.3 Tue Dec 11 17:35:11 2007
+++ php-src/ext/ldap/tests/ldap_explode_dn.phpt Thu Dec 13 17:46:46 2007
@@ -5,22 +5,40 @@
--FILE--
?php
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode with attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 0));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Explode without attributes */
var_dump(ldap_explode_dn(cn=bob,ou=users,dc=example,dc=com, 1));
+/* Explode with attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 0));
+/* Explode without attributes and characters */
var_dump(ldap_explode_dn(cn=bob,dc=example,dc=com, 1));
+/* Too few parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com);
+
+/* Too many parameters */
+ldap_explode_dn(cn=bob,dc=example,dc=com, 1, 1);
+
+/* Bad DN value with attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 0));
+
+/* Bad DN value without attributes */
+var_dump(ldap_explode_dn(bob,dc=example,dc=com, 1));
+
echo Done\n;
?
---EXPECT--
+--EXPECTF--
array(4) {
[count]=
int(3)
@@ -67,4 +85,10 @@
}
bool(false)
bool(false)
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+
+Warning: Wrong parameter count for ldap_explode_dn() in %s on line %d
+bool(false)
+bool(false)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap/tests ldap_dn2ufn.phpt
cardoe Thu Dec 13 17:59:51 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/ldap/tests ldap_dn2ufn.phpt Log: add tests for ldap_dn2ufn() http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_dn2ufn.phpt?view=markuprev=1.1 Index: php-src/ext/ldap/tests/ldap_dn2ufn.phpt +++ php-src/ext/ldap/tests/ldap_dn2ufn.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap/tests ldap_dn2ufn.phpt
cardoe Thu Dec 13 18:00:46 2007 UTC
Modified files:
/php-src/ext/ldap/tests ldap_dn2ufn.phpt
Log:
add tests for ldap_dn2ufn()
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_dn2ufn.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/ldap/tests/ldap_dn2ufn.phpt
diff -u /dev/null php-src/ext/ldap/tests/ldap_dn2ufn.phpt:1.2
--- /dev/null Thu Dec 13 18:00:46 2007
+++ php-src/ext/ldap/tests/ldap_dn2ufn.phpt Thu Dec 13 18:00:46 2007
@@ -0,0 +1,33 @@
+--TEST--
+ldap_dn2ufn() test
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+
+/* Convert valid DN */
+var_dump(ldap_dn2ufn(cn=bob,dc=example,dc=com));
+
+/* Convert valid DN */
+var_dump(ldap_dn2ufn(cn=bob,ou=users,dc=example,dc=com));
+
+/* Convert DN with characters */
+var_dump(ldap_dn2ufn(cn=bob,dc=example,dc=com));
+
+/* Too many parameters */
+ldap_dn2ufn(cn=bob,dc=example,dc=com, 1);
+
+/* Bad DN value */
+var_dump(ldap_dn2ufn(bob,dc=example,dc=com));
+
+echo Done\n;
+
+?
+--EXPECTF--
+string(16) bob, example.com
+string(23) bob, users, example.com
+bool(false)
+
+Warning: Wrong parameter count for ldap_dn2ufn() in %s on line %d
+bool(false)
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/ldap/tests ldap_dn2ufn.phpt
cardoe Thu Dec 13 18:00:27 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/ldap/tests ldap_dn2ufn.phpt Log: add tests for ldap_dn2ufn() http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/tests/ldap_dn2ufn.phpt?view=markuprev=1.1 Index: php-src/ext/ldap/tests/ldap_dn2ufn.phpt +++ php-src/ext/ldap/tests/ldap_dn2ufn.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap ldap.c
cardoe Thu Mar 22 21:50:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/ldap ldap.c
Log:
Replaced all instances of ldap_get_values() with ldap_get_values_len(), which
returns back the length of the data so on non-NULL terminated data we don't
crash in a strlen(). Removed the PHP function ldap_get_values() since it's the
same thing as ldap_get_values_len() now and made it alias
ldap_get_values_len(). This should fix some random PHP-LDAP crashes
http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/ldap.c?r1=1.161.2.3.2.3r2=1.161.2.3.2.4diff_format=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.161.2.3.2.3
php-src/ext/ldap/ldap.c:1.161.2.3.2.4
--- php-src/ext/ldap/ldap.c:1.161.2.3.2.3 Fri Jan 5 15:06:55 2007
+++ php-src/ext/ldap/ldap.c Thu Mar 22 21:50:34 2007
@@ -18,11 +18,12 @@
| Gerrit Thomson [EMAIL PROTECTED] |
| Jani Taskinen [EMAIL PROTECTED] |
| Stig Venaas[EMAIL PROTECTED] |
+ | Doug Goldstein [EMAIL PROTECTED] |
| PHP 4.0 updates: Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: ldap.c,v 1.161.2.3.2.3 2007/01/05 15:06:55 iliaa Exp $ */
+/* $Id: ldap.c,v 1.161.2.3.2.4 2007/03/22 21:50:34 cardoe Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -117,7 +118,7 @@
PHP_FE(ldap_first_attribute,third_arg_force_ref)
PHP_FE(ldap_next_attribute, third_arg_force_ref)
PHP_FE(ldap_get_attributes,
NULL)
- PHP_FE(ldap_get_values,
NULL)
+ PHP_FALIAS(ldap_get_values, ldap_get_values_len,
NULL)
PHP_FE(ldap_get_values_len,
NULL)
PHP_FE(ldap_get_dn,
NULL)
PHP_FE(ldap_explode_dn,
NULL)
@@ -317,7 +318,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.3
2007/01/05 15:06:55 iliaa Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.161.2.3.2.4
2007/03/22 21:50:34 cardoe Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -1036,7 +1037,7 @@
BerElement *ber;
char *attribute;
size_t attr_len;
- char **ldap_value;
+ struct berval **ldap_value;
char *dn;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, link, result)
== FAILURE) {
@@ -1067,16 +1068,16 @@
attribute = ldap_first_attribute(ldap, ldap_result_entry, ber);
while (attribute != NULL) {
- ldap_value = ldap_get_values(ldap, ldap_result_entry,
attribute);
- num_values = ldap_count_values(ldap_value);
+ ldap_value = ldap_get_values_len(ldap,
ldap_result_entry, attribute);
+ num_values = ldap_count_values_len(ldap_value);
MAKE_STD_ZVAL(tmp2);
array_init(tmp2);
add_assoc_long(tmp2, count, num_values);
for (i = 0; i num_values; i++) {
- add_index_string(tmp2, i, ldap_value[i], 1);
+ add_index_stringl(tmp2, i,
ldap_value[i]-bv_val, ldap_value[i]-bv_len, 1);
}
- ldap_value_free(ldap_value);
+ ldap_value_free_len(ldap_value);
attr_len = strlen(attribute);
zend_hash_update(Z_ARRVAL_P(tmp1),
php_strtolower(attribute, attr_len), attr_len+1, (void *) tmp2, sizeof(zval
*), NULL);
@@ -1183,7 +1184,7 @@
ldap_linkdata *ld;
ldap_resultentry *resultentry;
char *attribute;
- char **ldap_value;
+ struct berval **ldap_value;
int i, num_values, num_attrib;
BerElement *ber;
@@ -1199,16 +1200,16 @@
attribute = ldap_first_attribute(ld-link, resultentry-data, ber);
while (attribute != NULL) {
- ldap_value = ldap_get_values(ld-link, resultentry-data,
attribute);
- num_values = ldap_count_values(ldap_value);
+ ldap_value = ldap_get_values_len(ld-link, resultentry-data,
attribute);
+ num_values = ldap_count_values_len(ldap_value);
MAKE_STD_ZVAL(tmp);
array_init(tmp);
add_assoc_long(tmp, count, num_values);
