[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/mail ezmlm_hash_error.phpt mail_include.inc mail_skipif.inc
tony2001Sun Jan 25 23:28:19 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/mailmail_skipif.inc mail_include.inc
ezmlm_hash_error.phpt
Log:
MFH use example.com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_skipif.inc?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_skipif.inc
diff -u php-src/ext/standard/tests/mail/mail_skipif.inc:1.2.2.2
php-src/ext/standard/tests/mail/mail_skipif.inc:1.2.2.3
--- php-src/ext/standard/tests/mail/mail_skipif.inc:1.2.2.2 Fri Jan 23
17:12:19 2009
+++ php-src/ext/standard/tests/mail/mail_skipif.inc Sun Jan 25 23:28:18 2009
@@ -3,7 +3,7 @@
// Change these to make tests run successfully
$mailbox = '{localhost}';
-$username = 'webmas...@something.com';
+$username = 'webmas...@example.com';
$password = 'p4ssw0rd';
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
@@ -13,4 +13,4 @@
die("skip could not connect to mailbox $mailbox");
}
imap_close($mbox);
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_include.inc?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_include.inc
diff -u php-src/ext/standard/tests/mail/mail_include.inc:1.2.2.2
php-src/ext/standard/tests/mail/mail_include.inc:1.2.2.3
--- php-src/ext/standard/tests/mail/mail_include.inc:1.2.2.2Fri Jan 23
17:12:19 2009
+++ php-src/ext/standard/tests/mail/mail_include.incSun Jan 25 23:28:18 2009
@@ -2,7 +2,7 @@
// Change these to make tests run successfully
$server = '{localhost}';
$default_mailbox = $server . "INBOX";
-$domain = "something.com";
+$domain = "example.com";
$admin_user = "webmaster"; // a user with admin access
$username = "$admin_u...@$domain";
$password = 'p4ssw0rd';
@@ -147,4 +147,4 @@
return $match[1];
}
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt
diff -u php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.2.2.2
php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.2.2.3
--- php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.2.2.2 Fri Jan
23 17:12:19 2009
+++ php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt Sun Jan 25
23:28:18 2009
@@ -14,7 +14,7 @@
echo "\n-- Testing ezmlm_hash() function with more than expected no. of
arguments --\n";
$extra_arg = 10;
-var_dump( ezmlm_hash("webmas...@something.com", $extra_arg) );
+var_dump( ezmlm_hash("webmas...@example.com", $extra_arg) );
echo "\n-- Testing ezmlm_hash() function with invalid input - ARRAY --\n";
$array_arg = array(1,2,3,4);
@@ -63,4 +63,4 @@
Warning: ezmlm_hash() expects parameter 1 to be string, resource given in %s
on line %d
NULL
-===DONE===
\ No newline at end of file
+===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/standard/tests/mail ezmlm_hash_error.phpt mail_include.inc mail_skipif.inc
tony2001Sun Jan 25 23:26:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/mailmail_skipif.inc mail_include.inc
ezmlm_hash_error.phpt
Log:
MFH use example.com
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_skipif.inc?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_skipif.inc
diff -u php-src/ext/standard/tests/mail/mail_skipif.inc:1.1.2.1
php-src/ext/standard/tests/mail/mail_skipif.inc:1.1.2.2
--- php-src/ext/standard/tests/mail/mail_skipif.inc:1.1.2.1 Fri Jan 23
17:12:07 2009
+++ php-src/ext/standard/tests/mail/mail_skipif.inc Sun Jan 25 23:26:45 2009
@@ -3,7 +3,7 @@
// Change these to make tests run successfully
$mailbox = '{localhost}';
-$username = 'webmas...@something.com';
+$username = 'webmas...@example.com';
$password = 'p4ssw0rd';
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
@@ -13,4 +13,4 @@
die("skip could not connect to mailbox $mailbox");
}
imap_close($mbox);
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_include.inc?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_include.inc
diff -u php-src/ext/standard/tests/mail/mail_include.inc:1.1.2.1
php-src/ext/standard/tests/mail/mail_include.inc:1.1.2.2
--- php-src/ext/standard/tests/mail/mail_include.inc:1.1.2.1Fri Jan 23
17:12:08 2009
+++ php-src/ext/standard/tests/mail/mail_include.incSun Jan 25 23:26:45 2009
@@ -2,7 +2,7 @@
// Change these to make tests run successfully
$server = '{localhost}';
$default_mailbox = $server . "INBOX";
-$domain = "something.com";
+$domain = "example.com";
$admin_user = "webmaster"; // a user with admin access
$username = "$admin_u...@$domain";
$password = 'p4ssw0rd';
@@ -147,4 +147,4 @@
return $match[1];
}
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt
diff -u php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.1.2.1
php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.1.2.2
--- php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.1.2.1 Fri Jan
23 17:12:07 2009
+++ php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt Sun Jan 25
23:26:45 2009
@@ -14,7 +14,7 @@
echo "\n-- Testing ezmlm_hash() function with more than expected no. of
arguments --\n";
$extra_arg = 10;
-var_dump( ezmlm_hash("webmas...@something.com", $extra_arg) );
+var_dump( ezmlm_hash("webmas...@example.com", $extra_arg) );
echo "\n-- Testing ezmlm_hash() function with invalid input - ARRAY --\n";
$array_arg = array(1,2,3,4);
@@ -63,4 +63,4 @@
Warning: ezmlm_hash() expects parameter 1 to be string, resource given in %s
on line %d
NULL
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/mail ezmlm_hash_error.phpt mail_include.inc mail_skipif.inc
tony2001Sun Jan 25 23:26:31 2009 UTC
Modified files:
/php-src/ext/standard/tests/mailmail_skipif.inc mail_include.inc
ezmlm_hash_error.phpt
Log:
use example.com instead of real domain name
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_skipif.inc?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_skipif.inc
diff -u php-src/ext/standard/tests/mail/mail_skipif.inc:1.2
php-src/ext/standard/tests/mail/mail_skipif.inc:1.3
--- php-src/ext/standard/tests/mail/mail_skipif.inc:1.2 Fri Jan 23 17:12:14 2009
+++ php-src/ext/standard/tests/mail/mail_skipif.inc Sun Jan 25 23:26:30 2009
@@ -3,7 +3,7 @@
// Change these to make tests run successfully
$mailbox = '{localhost}';
-$username = 'webmas...@something.com';
+$username = 'webmas...@example.com';
$password = 'p4ssw0rd';
$options = OP_HALFOPEN; // this should be enough to verify server present
$retries = 0; // dont retry connect on failure
@@ -13,4 +13,4 @@
die("skip could not connect to mailbox $mailbox");
}
imap_close($mbox);
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/mail_include.inc?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/mail/mail_include.inc
diff -u php-src/ext/standard/tests/mail/mail_include.inc:1.2
php-src/ext/standard/tests/mail/mail_include.inc:1.3
--- php-src/ext/standard/tests/mail/mail_include.inc:1.2Fri Jan 23
17:12:14 2009
+++ php-src/ext/standard/tests/mail/mail_include.incSun Jan 25 23:26:30 2009
@@ -2,7 +2,7 @@
// Change these to make tests run successfully
$server = '{localhost}';
$default_mailbox = $server . "INBOX";
-$domain = "something.com";
+$domain = "example.com";
$admin_user = "webmaster"; // a user with admin access
$username = "$admin_u...@$domain";
$password = 'p4ssw0rd';
@@ -147,4 +147,4 @@
return $match[1];
}
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt
diff -u php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.2
php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.3
--- php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt:1.2 Fri Jan 23
17:12:14 2009
+++ php-src/ext/standard/tests/mail/ezmlm_hash_error.phpt Sun Jan 25
23:26:30 2009
@@ -14,7 +14,7 @@
echo "\n-- Testing ezmlm_hash() function with more than expected no. of
arguments --\n";
$extra_arg = 10;
-var_dump( ezmlm_hash("webmas...@something.com", $extra_arg) );
+var_dump( ezmlm_hash("webmas...@example.com", $extra_arg) );
echo "\n-- Testing ezmlm_hash() function with invalid input - ARRAY --\n";
$array_arg = array(1,2,3,4);
@@ -63,4 +63,4 @@
Warning: ezmlm_hash() expects parameter 1 to be binary string, resource given
in %s on line %d
NULL
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
tony2001Sun Jan 25 23:02:19 2009 UTC Modified files: /php-src/ext/curl interface.c Log: ifdef -> if http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.144&r2=1.145&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.144 php-src/ext/curl/interface.c:1.145 --- php-src/ext/curl/interface.c:1.144 Sun Jan 25 22:33:19 2009 +++ php-src/ext/curl/interface.cSun Jan 25 23:02:18 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.144 2009/01/25 22:33:19 tony2001 Exp $ */ +/* $Id: interface.c,v 1.145 2009/01/25 23:02:18 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -719,7 +719,7 @@ #endif /* SSH support works in 7.19.0+ using libssh2 */ -#ifdef LIBCURL_VERSION_NUM >= 0x071300 +#if LIBCURL_VERSION_NUM >= 0x071300 REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE); REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY); REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
tony2001Sun Jan 25 22:33:19 2009 UTC Modified files: /php-src/ext/curl interface.c Log: do not define CURLE_SSH twice http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.143&r2=1.144&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.143 php-src/ext/curl/interface.c:1.144 --- php-src/ext/curl/interface.c:1.143 Sun Jan 25 17:12:22 2009 +++ php-src/ext/curl/interface.cSun Jan 25 22:33:19 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.143 2009/01/25 17:12:22 pajoye Exp $ */ +/* $Id: interface.c,v 1.144 2009/01/25 22:33:19 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -682,9 +682,6 @@ #if LIBCURL_VERSION_NUM >= 0x070b00 REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED); #endif -#ifdef LIBCURL_VERSION_NUM >= 0x071300 - REGISTER_CURL_CONSTANT(CURLE_SSH); -#endif REGISTER_CURL_CONSTANT(CURLPROXY_HTTP); REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4); REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5); -- 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/curl interface.c
tony2001Sun Jan 25 22:33:10 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl interface.c Log: do not define CURLE_SSH twice http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.28&r2=1.62.2.14.2.27.2.29&diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28 php-src/ext/curl/interface.c:1.62.2.14.2.27.2.29 --- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28Sun Jan 25 17:12:36 2009 +++ php-src/ext/curl/interface.cSun Jan 25 22:33:10 2009 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.27.2.28 2009/01/25 17:12:36 pajoye Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.27.2.29 2009/01/25 22:33:10 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -683,9 +683,6 @@ #if LIBCURL_VERSION_NUM >= 0x070b00 REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED); #endif -#if LIBCURL_VERSION_NUM >= 0x071300 - REGISTER_CURL_CONSTANT(CURLE_SSH); -#endif REGISTER_CURL_CONSTANT(CURLPROXY_HTTP); REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions is_callable.phpt is_callable_basic1.phpt is_callable_basic2.phpt is_callable_error.phpt is_callable_variation1.phpt is_callable_variation2.
wharmby Sun Jan 25 22:16:38 2009 UTC Removed files: /php-src/ext/standard/tests/general_functions is_callable.phpt Modified files: /php-src/ext/standard/tests/general_functions is_callable_error.phpt is_callable_basic1.phpt is_callable_variation1.phpt is_callable_variation2.phpt is_callable_basic2.phpt Log: Split is_callable test. Test on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_callable_error.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/is_callable_error.phpt:1.2 --- /dev/null Sun Jan 25 22:16:38 2009 +++ php-src/ext/standard/tests/general_functions/is_callable_error.phpt Sun Jan 25 22:16:37 2009 @@ -0,0 +1,35 @@ +--TEST-- +Test is_callable() function +--INI-- +precision=14 +error_reporting = E_ALL & ~E_NOTICE | E_STRICT +--FILE-- + +===DONE=== +--EXPECTF-- +*** Testing error conditions *** + +-- Testing is_callable() function with less than expected no. of arguments -- + +Warning: is_callable() expects at least 1 parameter, 0 given in %s on line %d +NULL + +-- Testing is_callable() function with more than expected no. of arguments -- + +Warning: is_callable() expects at most 3 parameters, 4 given in %s on line %d +NULL +===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt:1.2 --- /dev/null Sun Jan 25 22:16:38 2009 +++ php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt Sun Jan 25 22:16:37 2009 @@ -0,0 +1,109 @@ +--TEST-- +Test is_callable() function : usage variations - defined functions +--INI-- +precision=14 +error_reporting = E_ALL & ~E_NOTICE | E_STRICT +--FILE-- + +===DONE=== +--EXPECT--- +*** Testing is_callable() on defined functions *** +-- Iteration 1 -- +bool(true) +bool(true) +bool(true) +someFunction +bool(true) +bool(true) +someFunction +-- Iteration 2 -- +bool(true) +bool(true) +bool(true) +x123 +bool(true) +bool(true) +x123 +-- Iteration 3 -- +bool(true) +bool(true) +bool(true) +NULL +bool(true) +bool(true) +NULL +-- Iteration 4 -- +bool(true) +bool(true) +bool(true) +false +bool(true) +bool(true) +false +-- Iteration 5 -- +bool(true) +bool(true) +bool(true) +Hello_World +bool(true) +bool(true) +Hello_World +===DONE=== \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt diff -u /dev/null php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt:1.2 --- /dev/null Sun Jan 25 22:16:38 2009 +++ php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt Sun Jan 25 22:16:37 2009 @@ -0,0 +1,208 @@ +--TEST-- +Test is_callable() function : usage variations - undefined functions +--INI-- +precision=14 +error_reporting = E_ALL & ~E_NOTICE | E_STRICT +--FILE-- + +===DONE=== +--EXPECTF-- +*** Testing is_callable() on undefined functions *** +-- Iteration 1 -- +bool(false) +bool(true) +bool(true) + +bool(false) +bool(false) + +-- Iteration 2 -- +bool(false) +bool(true) +bool(true) + +bool(false) +bool(false) + +-- Iteration 3 -- +bool(false) +bool(true) +bool(true) + +bool(false) +bool(false) + +-- Iteration 4 -- +bool(false) +bool(true) +bool(true) + +bool(false) +bool(false) + +-- Iteration 5 -- +bool(false) +bool(true) +bool(true) +12356 +bool(false) +bool(false) +12356 +-- Iteration 6 -- +bool(false) +bool(true) +bool(true) +%c +bool(false) +bool(false) +%c +-- Iteration 7 -- +bool(false) +bool(true) +bool(true) +\0 +bool(false) +bool(false) +\0 +-- Iteration 8 -- +bool(false) +bool(true) +bool(true) +hello world +bool(false) +bool(false) +hello world +-- Iteration 9 -- +bool(false) +bool(true) +bool(true) +hello world +bool(false) +bool(false) +hello world +-- Iteration 10 -- +bool(false) +bool(true) +bool(true) +welcome%c +bool(false) +bool(false) +welcome%c +-- Iteration 11 -- +bool(false) +bool(true) +bool(true) +welcome\0 +bool(false) +bool(false) +welcome\0 +-- Iteration 12 -- +bool(false) +bool(true) +bool(true) +==%%%***$$$@@@!! +bool(false) +bool(false) +==%%%***$$$@@@!! +-- Iteration 13 -- +bool(false) +bool(true) +bool(true) +false +bool(false) +bool(false) +false +-- Iteration 14 -- +bool(false) +bool(
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions is_callable.phpt is_callable_basic1.phpt is_callable_basic2.phpt is_callable_error.phpt is_callable_variation1.phpt is_callable_va
wharmby Sun Jan 25 22:16:33 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions is_callable_variation2.phpt is_callable_basic2.phpt is_callable_basic1.phpt is_callable_variation1.phpt is_callable_error.phpt Removed files: /php-src/ext/standard/tests/general_functions is_callable.phpt Log: Split is_callable test. Test on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_error.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_error.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/standard/tests/general_functions is_callable.phpt is_callable_basic1.phpt is_callable_basic2.phpt is_callable_error.phpt is_callable_variation1.phpt is_callable_va
wharmby Sun Jan 25 22:16:28 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions is_callable_variation1.phpt is_callable_error.phpt is_callable_variation2.phpt is_callable_basic2.phpt is_callable_basic1.phpt Removed files: /php-src/ext/standard/tests/general_functions is_callable.phpt Log: Split is_callable test. Test on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_error.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_error.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt +++ php-src/ext/standard/tests/general_functions/is_callable_basic1.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard base64.c /ext/standard/tests/url bug47174.phpt
iliaa Sun Jan 25 18:27:58 2009 UTC Modified files: /php-src/ext/standard/tests/url bug47174.phpt /php-src/ext/standard base64.c Log: MFB: Improved fix for bug #47174 & added a test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/bug47174.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/url/bug47174.phpt diff -u /dev/null php-src/ext/standard/tests/url/bug47174.phpt:1.2 --- /dev/null Sun Jan 25 18:27:58 2009 +++ php-src/ext/standard/tests/url/bug47174.phptSun Jan 25 18:27:56 2009 @@ -0,0 +1,18 @@ +--TEST-- +Bug #47174 (base64_decode() interprets pad char in mid string as terminator) +--FILE-- + +--EXPECT-- +Invalid Signature +string(10) "Zm9v==YmFy" +string(6) "foobar" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.58&r2=1.59&diff_format=u Index: php-src/ext/standard/base64.c diff -u php-src/ext/standard/base64.c:1.58 php-src/ext/standard/base64.c:1.59 --- php-src/ext/standard/base64.c:1.58 Wed Jan 21 15:45:45 2009 +++ php-src/ext/standard/base64.c Sun Jan 25 18:27:58 2009 @@ -15,7 +15,7 @@ | Author: Jim Winstead | +--+ */ -/* $Id: base64.c,v 1.58 2009/01/21 15:45:45 iliaa Exp $ */ +/* $Id: base64.c,v 1.59 2009/01/25 18:27:58 iliaa Exp $ */ #include @@ -156,7 +156,6 @@ efree(result); return NULL; } - i++; continue; } -- 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/standard base64.c /ext/standard/tests/url bug47174.phpt
iliaa Sun Jan 25 18:27:39 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/url bug47174.phpt Modified files: /php-src/ext/standard base64.c Log: MFB: Improved fix for bug #47174 & added a test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.43.2.2.2.6&r2=1.43.2.2.2.7&diff_format=u Index: php-src/ext/standard/base64.c diff -u php-src/ext/standard/base64.c:1.43.2.2.2.6 php-src/ext/standard/base64.c:1.43.2.2.2.7 --- php-src/ext/standard/base64.c:1.43.2.2.2.6 Wed Jan 21 15:45:29 2009 +++ php-src/ext/standard/base64.c Sun Jan 25 18:27:39 2009 @@ -15,7 +15,7 @@ | Author: Jim Winstead | +--+ */ -/* $Id: base64.c,v 1.43.2.2.2.6 2009/01/21 15:45:29 iliaa Exp $ */ +/* $Id: base64.c,v 1.43.2.2.2.7 2009/01/25 18:27:39 iliaa Exp $ */ #include @@ -158,7 +158,6 @@ efree(result); return NULL; } - i++; continue; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/bug47174.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/url/bug47174.phpt +++ php-src/ext/standard/tests/url/bug47174.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_3) /ext/standard base64.c /ext/standard/tests/url bug47174.phpt
iliaa Sun Jan 25 18:27:12 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/url bug47174.phpt Modified files: /php-src/ext/standard base64.c Log: Improved fix for bug #47174 & added a test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.43.2.2.2.3.2.5&r2=1.43.2.2.2.3.2.6&diff_format=u Index: php-src/ext/standard/base64.c diff -u php-src/ext/standard/base64.c:1.43.2.2.2.3.2.5 php-src/ext/standard/base64.c:1.43.2.2.2.3.2.6 --- php-src/ext/standard/base64.c:1.43.2.2.2.3.2.5 Wed Jan 21 15:38:37 2009 +++ php-src/ext/standard/base64.c Sun Jan 25 18:27:11 2009 @@ -15,7 +15,7 @@ | Author: Jim Winstead | +--+ */ -/* $Id: base64.c,v 1.43.2.2.2.3.2.5 2009/01/21 15:38:37 iliaa Exp $ */ +/* $Id: base64.c,v 1.43.2.2.2.3.2.6 2009/01/25 18:27:11 iliaa Exp $ */ #include @@ -156,7 +156,6 @@ efree(result); return NULL; } - i++; continue; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/bug47174.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/url/bug47174.phpt +++ php-src/ext/standard/tests/url/bug47174.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_3) /ext/curl interface.c
pajoye Sun Jan 25 17:12:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
- nicer features list
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.27&r2=1.62.2.14.2.27.2.28&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.27
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.28
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.27Sun Jan 25 16:28:18 2009
+++ php-src/ext/curl/interface.cSun Jan 25 17:12:36 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.27 2009/01/25 16:28:18 pajoye Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.28 2009/01/25 17:12:36 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -332,77 +332,64 @@
sprintf(str, "%d", d->age);
php_info_print_table_row(2, "Age", str);
-#ifdef CURL_VERSION_IPV6
- if (d->features & CURL_VERSION_IPV6) {
- n = sprintf(str, "%s", "IPv6-enabled, ");
- }
-#endif
+ /* To update on each new cURL release using src/main.c in cURL sources
*/
+ if(d->features) {
+ struct feat {
+ const char *name;
+ int bitmask;
+ };
-#ifdef CURL_VERSION_KERBEROS4
- if (d->features & CURL_VERSION_KERBEROS4) {
- n += sprintf(str + n, "%s", "kerberos auth is
supported, ");
- }
-#endif
+ unsigned int i;
-#ifdef CURL_VERSION_SSL
- if (d->features & CURL_VERSION_SSL) {
- n += sprintf(str + n, "%s", "SSL options are present,
");
- }
-#endif
-
-#ifdef CURL_VERSION_LIBZ
- if (d->features & CURL_VERSION_LIBZ) {
- n += sprintf(str + n, "%s", "libz features are present,
");
- }
+ static const struct feat feats[] = {
+#if LIBCURL_VERSION_NUM > 0x070a06 /* 7.10.7 */
+ {"AsynchDNS", CURL_VERSION_ASYNCHDNS},
#endif
-
#if LIBCURL_VERSION_NUM > 0x070a05 /* 7.10.6 */
- if (d->features & CURL_VERSION_NTLM) {
- n += sprintf(str + n, "%s", "NTLM auth is supported, ");
- }
- if (d->features & CURL_VERSION_GSSNEGOTIATE) {
- n += sprintf(str + n, "%s", "Negotiate auth support, ");
- }
- if (d->features & CURL_VERSION_DEBUG) {
- n += sprintf(str + n, "%s", "built with debug
capabilities, ");
- }
+ {"Debug", CURL_VERSION_DEBUG},
+ {"GSS-Negotiate", CURL_VERSION_GSSNEGOTIATE},
#endif
-
-#if LIBCURL_VERSION_NUM > 0x070a06 /* 7.10.7 */
- if (d->features & CURL_VERSION_ASYNCHDNS) {
- n += sprintf(str + n, "%s", "asynchronous dns resolves,
");
- }
+#if LIBCURL_VERSION_NUM > 0x070b02 /* 7.12.0 */
+ {"IDN", CURL_VERSION_IDN},
#endif
-#if LIBCURL_VERSION_NUM > 0x070a07 /* 7.10.8 */
- if (d->features & CURL_VERSION_SPNEGO) {
- n += sprintf(str + n, "%s", "SPNEGO auth, ");
- }
+#ifdef CURL_VERSION_IPV6
+ {"IPv6", CURL_VERSION_IPV6},
#endif
#if LIBCURL_VERSION_NUM > 0x070a09 /* 7.10.1 */
- if (d->features & CURL_VERSION_LARGEFILE) {
- n += sprintf(str + n, "%s", "supports files bigger than
2GB, ");
- }
+ {"Largefile", CURL_VERSION_LARGEFILE},
#endif
-#if LIBCURL_VERSION_NUM > 0x070b02 /* 7.12.0 */
- if (d->features & CURL_VERSION_IDN) {
- n += sprintf(str + n, "%s", "International Domain Names
support, ");
- }
+#if LIBCURL_VERSION_NUM > 0x070a05 /* 7.10.6 */
+ {"NTLM", CURL_VERSION_NTLM},
+#endif
+#if LIBCURL_VERSION_NUM > 0x070a07 /* 7.10.8 */
+ {"SPNEGO", CURL_VERSION_SPNEGO},
+#endif
+#ifdef CURL_VERSION_SSL
+ {"SSL", CURL_VERSION_SSL},
#endif
#if LIBCURL_VERSION_NUM > 0x070d01 /* 7.13.2 */
- if (d->features & CURL_VERSION_SSPI) {
- n += sprintf(str + n, "%s", "SSPI is supported, ");
- }
+ {"SSPI", CURL_VERSION_SSPI},
+#endif
+#ifdef CURL_VERSION_KERBEROS4
+ {"krb4", CURL_VERSION_KERBEROS4},
+#endif
+#ifdef CURL_VERSION_LIBZ
+ {"libz", CURL_VERSION_LIBZ},
#endif
#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
- if (d->features & CURL_VERSION_CONV) {
- n += sprintf(str + n, "%s", "character conversions are
supported, ");
- }
+ {"CharConv", CURL_VERSION_CONV},
#endif
+ NULL, 0
+ };
- if (n > 3) {
- str[n - 2] = '\0';
+ php_info_print_table_row(1, "Features");
+ for(i=0; ifeatures & feat
[PHP-CVS] cvs: php-src /ext/curl interface.c
pajoye Sun Jan 25 17:12:24 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- nicer features list
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.142&r2=1.143&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.142 php-src/ext/curl/interface.c:1.143
--- php-src/ext/curl/interface.c:1.142 Sun Jan 25 16:27:25 2009
+++ php-src/ext/curl/interface.cSun Jan 25 17:12:22 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.142 2009/01/25 16:27:25 pajoye Exp $ */
+/* $Id: interface.c,v 1.143 2009/01/25 17:12:22 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -330,77 +330,65 @@
sprintf(str, "%d", d->age);
php_info_print_table_row(2, "Age", str);
-#ifdef CURL_VERSION_IPV6
- if (d->features & CURL_VERSION_IPV6) {
- n = sprintf(str, "%s", "IPv6-enabled, ");
- }
-#endif
-
-#ifdef CURL_VERSION_KERBEROS4
- if (d->features & CURL_VERSION_KERBEROS4) {
- n += sprintf(str + n, "%s", "kerberos auth is
supported, ");
- }
-#endif
+ /* To update on each new cURL release using src/main.c in cURL sources
*/
+ if(d->features) {
+ struct feat {
+ const char *name;
+ int bitmask;
+ };
-#ifdef CURL_VERSION_SSL
- if (d->features & CURL_VERSION_SSL) {
- n += sprintf(str + n, "%s", "SSL options are present,
");
- }
-#endif
+ unsigned int i;
-#ifdef CURL_VERSION_LIBZ
- if (d->features & CURL_VERSION_LIBZ) {
- n += sprintf(str + n, "%s", "libz features are present,
");
- }
+ static const struct feat feats[] = {
+#if LIBCURL_VERSION_NUM > 0x070a06 /* 7.10.7 */
+ {"AsynchDNS", CURL_VERSION_ASYNCHDNS},
#endif
#if LIBCURL_VERSION_NUM > 0x070a05 /* 7.10.6 */
- if (d->features & CURL_VERSION_NTLM) {
- n += sprintf(str + n, "%s", "NTLM auth is supported, ");
- }
- if (d->features & CURL_VERSION_GSSNEGOTIATE) {
- n += sprintf(str + n, "%s", "Negotiate auth support, ");
- }
- if (d->features & CURL_VERSION_DEBUG) {
- n += sprintf(str + n, "%s", "built with debug
capabilities, ");
- }
+ {"Debug", CURL_VERSION_DEBUG},
+ {"GSS-Negotiate", CURL_VERSION_GSSNEGOTIATE},
#endif
-
-#if LIBCURL_VERSION_NUM > 0x070a06 /* 7.10.7 */
- if (d->features & CURL_VERSION_ASYNCHDNS) {
- n += sprintf(str + n, "%s", "asynchronous dns resolves,
");
- }
+#if LIBCURL_VERSION_NUM > 0x070b02 /* 7.12.0 */
+ {"IDN", CURL_VERSION_IDN},
#endif
-#if LIBCURL_VERSION_NUM > 0x070a07 /* 7.10.8 */
- if (d->features & CURL_VERSION_SPNEGO) {
- n += sprintf(str + n, "%s", "SPNEGO auth, ");
- }
+#ifdef CURL_VERSION_IPV6
+ {"IPv6", CURL_VERSION_IPV6},
#endif
#if LIBCURL_VERSION_NUM > 0x070a09 /* 7.10.1 */
- if (d->features & CURL_VERSION_LARGEFILE) {
- n += sprintf(str + n, "%s", "supports files bigger than
2GB, ");
- }
+ {"Largefile", CURL_VERSION_LARGEFILE},
#endif
-#if LIBCURL_VERSION_NUM > 0x070b02 /* 7.12.0 */
- if (d->features & CURL_VERSION_IDN) {
- n += sprintf(str + n, "%s", "International Domain Names
support, ");
- }
+#if LIBCURL_VERSION_NUM > 0x070a05 /* 7.10.6 */
+ {"NTLM", CURL_VERSION_NTLM},
+#endif
+#if LIBCURL_VERSION_NUM > 0x070a07 /* 7.10.8 */
+ {"SPNEGO", CURL_VERSION_SPNEGO},
+#endif
+#ifdef CURL_VERSION_SSL
+ {"SSL", CURL_VERSION_SSL},
#endif
#if LIBCURL_VERSION_NUM > 0x070d01 /* 7.13.2 */
- if (d->features & CURL_VERSION_SSPI) {
- n += sprintf(str + n, "%s", "SSPI is supported, ");
- }
+ {"SSPI", CURL_VERSION_SSPI},
+#endif
+#ifdef CURL_VERSION_KERBEROS4
+ {"krb4", CURL_VERSION_KERBEROS4},
+#endif
+#ifdef CURL_VERSION_LIBZ
+ {"libz", CURL_VERSION_LIBZ},
#endif
#if LIBCURL_VERSION_NUM > 0x070f03 /* 7.15.4 */
- if (d->features & CURL_VERSION_CONV) {
- n += sprintf(str + n, "%s", "character conversions are
supported, ");
- }
+ {"CharConv", CURL_VERSION_CONV},
#endif
+ NULL, 0
+ };
- if (n > 3) {
- str[n - 2] = '\0';
+ php_info_print_table_row(1, "Features");
+ for(i=0; ifeatures & feats[i].bitmask ? "Yes" : "No");
+ }
+ }
}
- php_info_print_table_row(2
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phpinfo_003.phpt /ext/standard/tests/network socket_get_status_basic.phpt /ext/standard/tests/strings str_pad_variation5.phpt
felipe Sun Jan 25 16:53:07 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests phpinfo_003.phpt
/php-src/ext/standard/tests/network socket_get_status_basic.phpt
/php-src/ext/standard/tests/strings str_pad_variation5.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.3.2.5&r2=1.3.2.6&diff_format=u
Index: php-src/ext/phar/tests/phpinfo_003.phpt
diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.5
php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.6
--- php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.5 Fri Aug 1 13:38:47 2008
+++ php-src/ext/phar/tests/phpinfo_003.phpt Sun Jan 25 16:53:05 2009
@@ -35,7 +35,7 @@
Phar based on pear/PHP_Archive, original concept by Davey Shafik.
Phar fully realized by Gregory Beaver and Marcus Boerger.
-Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle.
+Portions of tar implementation Copyright (c) 2003-200%d Tim Kientzle.
Directive => Local Value => Master Value
phar.cache_list => no value => no value
phar.readonly => On => On
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt
diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.2
php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.2
Sat Jan 24 22:02:36 2009
+++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sun Jan
25 16:53:06 2009
@@ -11,7 +11,7 @@
--EXPECTF--
array(7) {
["stream_type"]=>
- string(%d) "tcp_socket%s"
+ string(%d) "tcp_socket%S"
["mode"]=>
string(2) "r+"
["unread_bytes"]=>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_pad_variation5.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/str_pad_variation5.phpt
diff -u php-src/ext/standard/tests/strings/str_pad_variation5.phpt:1.2.2.2
php-src/ext/standard/tests/strings/str_pad_variation5.phpt:1.2.2.3
--- php-src/ext/standard/tests/strings/str_pad_variation5.phpt:1.2.2.2 Mon Jan
19 15:46:40 2009
+++ php-src/ext/standard/tests/strings/str_pad_variation5.phpt Sun Jan 25
16:53:07 2009
@@ -28,4 +28,4 @@
--EXPECTF--
*** Testing str_pad() function: with large value for for 'pad_length' argument
***
-Fatal error: Allowed memory size of 134217728 bytes exhausted (tried to
allocate 2147483648 bytes) in %s on line %d
\ No newline at end of file
+Fatal error: Allowed memory size of 134217728 bytes exhausted%s(tried to
allocate 2147483648 bytes) in %s on line %d
--
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) / NEWS
pajoye Sun Jan 25 16:35:06 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - curl ssh entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.473&r2=1.2027.2.547.2.965.2.474&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.473 php-src/NEWS:1.2027.2.547.2.965.2.474 --- php-src/NEWS:1.2027.2.547.2.965.2.473 Sat Jan 24 12:19:21 2009 +++ php-src/NEWSSun Jan 25 16:35:05 2009 @@ -23,6 +23,7 @@ - Changed open_basedir to allow tightening in runtime contexts. (Sara) - Changed PHP/Zend extensions to use flexible build IDs. (Stas) +- Added support for SSH via libssh2 in cURL. (Pierre) - Added support for fnmatch() on Windows. (Pierre) - Added support for time_nanosleep() and time_sleep_until() on Windows. (Pierre) -- 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/curl interface.c
pajoye Sun Jan 25 16:28:19 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl interface.c
Log:
- MFH
- [DOC] Add support for SSH via libssh2
- new constants: CURLE_SSH, CURLSSH_AUTH_NONE, CURLSSH_AUTH_PUBLICKEY,
CURLSSH_AUTH_PASSWORD, CURLSSH_AUTH_HOST, CURLSSH_AUTH_KEYBOARD,
CURLSSH_AUTH_DEFAULT, CURLOPT_SSH_AUTH_TYPES, CURLOPT_KEYPASSWD,
CURLOPT_SSH_PUBLIC_KEYFILE, CURLOPT_SSH_PRIVATE_KEYFILE,
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
See http://curl.haxx.se/libcurl/c/curl_easy_setopt.html fortheir roles or
usages
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.26&r2=1.62.2.14.2.27.2.27&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.26
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.27
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.26Wed Dec 31 11:15:35 2008
+++ php-src/ext/curl/interface.cSun Jan 25 16:28:18 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.26 2008/12/31 11:15:35 sebastian Exp $
*/
+/* $Id: interface.c,v 1.62.2.14.2.27.2.27 2009/01/25 16:28:18 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -433,7 +433,7 @@
}
#endif
-#if defined(CURLVERSION_FOURTH) && CURLVERSION_NOW >= CURLVERSION_FOURTH
+#if LIBCURL_VERSION_NUM >= 0x071300
if (d->iconv_ver_num) {
php_info_print_table_row(2, "IconV Version", d->iconv_ver_num);
@@ -696,7 +696,9 @@
#if LIBCURL_VERSION_NUM >= 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
#endif
-
+#if LIBCURL_VERSION_NUM >= 0x071300
+ REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
@@ -732,6 +734,22 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
#endif
+/* SSH support works in 7.19.0+ using libssh2 */
+#if LIBCURL_VERSION_NUM >= 0x071300
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+ REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
+ REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
+
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1442,14 +1460,23 @@
case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
- case CURLOPT_ENCODING: {
+ case CURLOPT_ENCODING:
+#if LIBCURL_VERSION_NUM >= 0x071300
+ case CURLOPT_SSH_PUBLIC_KEYFILE:
+ case CURLOPT_SSH_PRIVATE_KEYFILE:
+#endif
+ {
#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
#endif
convert_to_string_ex(zvalue);
- if (option == CURLOPT_URL) {
+ if (option == CURLOPT_URL
+#if LIBCURL_VERSION_NUM >= 0x071300
+ || option == CURLOPT_SSH_PUBLIC_KEYFILE ||
option == CURLOPT_SSH_PRIVATE_KEYFILE
+#endif
+ ) {
PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
}
@@ -1471,7 +1498,7 @@
FILE *fp = NULL;
int type;
void * what;
-
+
what = zend_fetch_resource(zvalue TSRMLS_CC, -1,
"File-Handle", &type, 1, php_file_le_stream());
if (!what) {
RETVAL_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
pajoye Sun Jan 25 16:27:27 2009 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- [DOC] Add support for SSH via libssh2
- new constants: CURLE_SSH, CURLSSH_AUTH_NONE, CURLSSH_AUTH_PUBLICKEY,
CURLSSH_AUTH_PASSWORD, CURLSSH_AUTH_HOST, CURLSSH_AUTH_KEYBOARD,
CURLSSH_AUTH_DEFAULT, CURLOPT_SSH_AUTH_TYPES, CURLOPT_KEYPASSWD,
CURLOPT_SSH_PUBLIC_KEYFILE, CURLOPT_SSH_PRIVATE_KEYFILE,
CURLOPT_SSH_HOST_PUBLIC_KEY_MD5
See http://curl.haxx.se/libcurl/c/curl_easy_setopt.html fortheir roles or
usages
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.141&r2=1.142&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.141 php-src/ext/curl/interface.c:1.142
--- php-src/ext/curl/interface.c:1.141 Wed Dec 31 11:12:30 2008
+++ php-src/ext/curl/interface.cSun Jan 25 16:27:25 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.141 2008/12/31 11:12:30 sebastian Exp $ */
+/* $Id: interface.c,v 1.142 2009/01/25 16:27:25 pajoye Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -431,7 +431,7 @@
}
#endif
-#if defined(CURLVERSION_FOURTH) && CURLVERSION_NOW >= CURLVERSION_FOURTH
+#if LIBCURL_VERSION_NUM >= 0x071300
if (d->iconv_ver_num) {
php_info_print_table_row(2, "IconV Version", d->iconv_ver_num);
@@ -694,7 +694,9 @@
#if LIBCURL_VERSION_NUM >= 0x070b00
REGISTER_CURL_CONSTANT(CURLE_FTP_SSL_FAILED);
#endif
-
+#ifdef LIBCURL_VERSION_NUM >= 0x071300
+ REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
REGISTER_CURL_CONSTANT(CURLPROXY_HTTP);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS4);
REGISTER_CURL_CONSTANT(CURLPROXY_SOCKS5);
@@ -731,6 +733,22 @@
REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
#endif
+/* SSH support works in 7.19.0+ using libssh2 */
+#ifdef LIBCURL_VERSION_NUM >= 0x071300
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_NONE);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PUBLICKEY);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_PASSWORD);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_HOST);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_KEYBOARD);
+ REGISTER_CURL_CONSTANT(CURLSSH_AUTH_DEFAULT);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_AUTH_TYPES);
+ REGISTER_CURL_CONSTANT(CURLOPT_KEYPASSWD);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_PUBLIC_KEYFILE);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_PRIVATE_KEYFILE);
+ REGISTER_CURL_CONSTANT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
+ REGISTER_CURL_CONSTANT(CURLE_SSH);
+#endif
+
#ifdef PHP_CURL_NEED_OPENSSL_TSL
if (!CRYPTO_get_id_callback()) {
int i, c = CRYPTO_num_locks();
@@ -1454,14 +1472,23 @@
case CURLOPT_SSLENGINE:
case CURLOPT_SSLENGINE_DEFAULT:
case CURLOPT_SSLCERTTYPE:
- case CURLOPT_ENCODING: {
+ case CURLOPT_ENCODING:
+#if LIBCURL_VERSION_NUM >= 0x071300
+ case CURLOPT_SSH_PUBLIC_KEYFILE:
+ case CURLOPT_SSH_PRIVATE_KEYFILE:
+#endif
+ {
#if LIBCURL_VERSION_NUM < 0x071100
char *copystr = NULL;
#endif
convert_to_string_ex(zvalue);
- if (option == CURLOPT_URL) {
+ if (option == CURLOPT_URL
+#if LIBCURL_VERSION_NUM >= 0x071300
+ || option == CURLOPT_SSH_PUBLIC_KEYFILE ||
option == CURLOPT_SSH_PRIVATE_KEYFILE
+#endif
+ ) {
PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue), 1);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.w32
pajoye Sun Jan 25 16:22:47 2009 UTC
Modified files:
/php-src/ext/curl config.w32
Log:
- MFB:
- update check for libs
- add HAVE_CURL_EASY_STRERROR, HAVE_CURL_MULTI_STRERROR,
HAVE_CURL_VERSION_INFO
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.8 php-src/ext/curl/config.w32:1.9
--- php-src/ext/curl/config.w32:1.8 Wed Nov 19 09:28:54 2008
+++ php-src/ext/curl/config.w32 Sun Jan 25 16:22:44 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.8 2008/11/19 09:28:54 pajoye Exp $
+// $Id: config.w32,v 1.9 2009/01/25 16:22:44 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -7,13 +7,18 @@
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) &&
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL")
&&
CHECK_LIB("ssleay32.lib", "curl", PHP_CURL) &&
- CHECK_LIB("libeay32.lib", "curl", PHP_CURL) &&
- (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "curl",
PHP_CURL) || CHECK_LIB("zlib.lib", "curl", PHP_CURL))) ||
- (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl",
PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED))) &&
- CHECK_LIB("winmm.lib", "curl", PHP_CURL)) {
- EXTENSION("curl", "interface.c multi.c streams.c");
+ CHECK_LIB("libeay32.lib", "curl", PHP_CURL)
+ && CHECK_LIB("winmm.lib", "curl", PHP_CURL)
+ && CHECK_LIB("wldap32.lib", "curl", PHP_CURL)
+ && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip",
PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip",
PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
+ ) {
+ EXTENSION("curl", "interface.c multi.c streams.c", true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
+ AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have
curl_easy_strerror in cURL');
+ AC_DEFINE('HAVE_CURL_MULTI_STRERROR', 1, 'Have
curl_multi_strerror in cURL');
+ AC_DEFINE('HAVE_CURL_VERSION_INFO', 1, 'Have curl_version_info
in cURL');
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL
wrappers [experimental]');
--
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/curl config.w32
pajoye Sun Jan 25 16:21:05 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/curl config.w32
Log:
- check for zlib too
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.3.4.1.2.2.2.3&r2=1.3.4.1.2.2.2.4&diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.3.4.1.2.2.2.3
php-src/ext/curl/config.w32:1.3.4.1.2.2.2.4
--- php-src/ext/curl/config.w32:1.3.4.1.2.2.2.3 Wed Nov 19 09:28:13 2008
+++ php-src/ext/curl/config.w32 Sun Jan 25 16:21:03 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3.4.1.2.2.2.3 2008/11/19 09:28:13 pajoye Exp $
+// $Id: config.w32,v 1.3.4.1.2.2.2.4 2009/01/25 16:21:03 pajoye Exp $
// vim:ft=javascript
ARG_WITH("curl", "cURL support", "no");
@@ -10,6 +10,8 @@
CHECK_LIB("libeay32.lib", "curl", PHP_CURL)
&& CHECK_LIB("winmm.lib", "curl", PHP_CURL)
&& CHECK_LIB("wldap32.lib", "curl", PHP_CURL)
+ && (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip",
PHP_ZIP) || CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) ||
+ (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip",
PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
) {
EXTENSION("curl", "interface.c multi.c streams.c", true);
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
johannesSun Jan 25 12:21:20 2009 UTC Modified files: /CVSROOTavail Log: Let dsp commit engine WS fixes himself http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1491&r2=1.1492&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1491 CVSROOT/avail:1.1492 --- CVSROOT/avail:1.1491Sat Jan 17 21:53:43 2009 +++ CVSROOT/avail Sun Jan 25 12:21:18 2009 @@ -36,7 +36,7 @@ avail|loudi,cweiske|phd,docweb # People who work on the Engine - not people with just tests access -avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler|Zend,ZendEngine2,TSRM +avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp|Zend,ZendEngine2,TSRM # The PHP Documentation Group maintains the documentation and its # translations. -- 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/standard/tests/assert assert.phpt assert02.phpt assert03.phpt assert04.phpt
zoe Sun Jan 25 11:08:23 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/assert assert04.phpt assert02.phpt assert03.phpt assert.phpt Log: Added INI sections http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2 php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.3 --- php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2 Fri Dec 8 14:39:25 2006 +++ php-src/ext/standard/tests/assert/assert04.phpt Sun Jan 25 11:08:21 2009 @@ -1,5 +1,11 @@ --TEST-- misc assert() tests tests +---INI--- +assert.active = 1 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.7 --- php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 Wed May 2 07:27:36 2007 +++ php-src/ext/standard/tests/assert/assert02.phpt Sun Jan 25 11:08:21 2009 @@ -1,5 +1,11 @@ --TEST-- catch assert() errors +---INI--- +assert.active = 1 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2 php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.3 --- php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2 Fri Dec 8 14:39:25 2006 +++ php-src/ext/standard/tests/assert/assert03.phpt Sun Jan 25 11:08:21 2009 @@ -1,5 +1,11 @@ --TEST-- assert() - set callback using ini_set() +---INI--- +assert.active = 1 +assert.warning = 0 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 1 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert.phpt?r1=1.4&r2=1.4.6.1&diff_format=u Index: php-src/ext/standard/tests/assert/assert.phpt diff -u php-src/ext/standard/tests/assert/assert.phpt:1.4 php-src/ext/standard/tests/assert/assert.phpt:1.4.6.1 --- php-src/ext/standard/tests/assert/assert.phpt:1.4 Mon Feb 16 06:39:13 2004 +++ php-src/ext/standard/tests/assert/assert.phpt Sun Jan 25 11:08:21 2009 @@ -2,6 +2,11 @@ assert() --INI-- error_reporting = 2039 +assert.active = 0 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/assert assert.phpt assert02.phpt assert03.phpt assert04.phpt
zoe Sun Jan 25 11:06:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/assert assert04.phpt assert.phpt assert03.phpt assert02.phpt Log: added INI and fixed assert02 to run on PHP6 and PHP53 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/assert/assert04.phpt:1.1.2.2.2.1 Wed Jul 23 19:34:35 2008 +++ php-src/ext/standard/tests/assert/assert04.phpt Sun Jan 25 11:06:36 2009 @@ -1,5 +1,11 @@ --TEST-- misc assert() tests tests +---INI--- +assert.active = 1 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert.phpt?r1=1.4&r2=1.4.8.1&diff_format=u Index: php-src/ext/standard/tests/assert/assert.phpt diff -u php-src/ext/standard/tests/assert/assert.phpt:1.4 php-src/ext/standard/tests/assert/assert.phpt:1.4.8.1 --- php-src/ext/standard/tests/assert/assert.phpt:1.4 Mon Feb 16 06:39:13 2004 +++ php-src/ext/standard/tests/assert/assert.phpt Sun Jan 25 11:06:36 2009 @@ -2,6 +2,11 @@ assert() --INI-- error_reporting = 2039 +assert.active = 0 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2 php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2.2.1 --- php-src/ext/standard/tests/assert/assert03.phpt:1.1.2.2 Fri Dec 8 14:39:25 2006 +++ php-src/ext/standard/tests/assert/assert03.phpt Sun Jan 25 11:06:36 2009 @@ -1,5 +1,11 @@ --TEST-- assert() - set callback using ini_set() +---INI--- +assert.active = 1 +assert.warning = 0 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 1 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.1.2.6&r2=1.1.2.6.2.1&diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6.2.1 --- php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 Wed May 2 07:27:36 2007 +++ php-src/ext/standard/tests/assert/assert02.phpt Sun Jan 25 11:06:36 2009 @@ -1,5 +1,11 @@ --TEST-- catch assert() errors +--INI-- +assert.active=1 +assert.warning=1 +assert.callback= +assert.bbail=0 +assert.quiet_eval=0 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/assert assert.phpt assert02.phpt assert03.phpt assert04.phpt
zoe Sun Jan 25 11:03:16 2009 UTC Modified files: /php-src/ext/standard/tests/assert assert.phpt assert02.phpt assert04.phpt assert03.phpt Log: added INI settings http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/standard/tests/assert/assert.phpt diff -u php-src/ext/standard/tests/assert/assert.phpt:1.4 php-src/ext/standard/tests/assert/assert.phpt:1.5 --- php-src/ext/standard/tests/assert/assert.phpt:1.4 Mon Feb 16 06:39:13 2004 +++ php-src/ext/standard/tests/assert/assert.phpt Sun Jan 25 11:03:14 2009 @@ -2,6 +2,11 @@ assert() --INI-- error_reporting = 2039 +assert.active = 0 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.6 php-src/ext/standard/tests/assert/assert02.phpt:1.7 --- php-src/ext/standard/tests/assert/assert02.phpt:1.6 Mon May 26 23:42:10 2008 +++ php-src/ext/standard/tests/assert/assert02.phpt Sun Jan 25 11:03:14 2009 @@ -1,5 +1,11 @@ --TEST-- catch assert() errors +--INI-- +assert.active=1 +assert.warning=1 +assert.callback= +assert.bbail=0 +assert.quiet_eval=0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert04.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/standard/tests/assert/assert04.phpt diff -u php-src/ext/standard/tests/assert/assert04.phpt:1.2 php-src/ext/standard/tests/assert/assert04.phpt:1.3 --- php-src/ext/standard/tests/assert/assert04.phpt:1.2 Wed Jul 23 19:33:58 2008 +++ php-src/ext/standard/tests/assert/assert04.phpt Sun Jan 25 11:03:15 2009 @@ -1,5 +1,11 @@ --TEST-- misc assert() tests tests +---INI--- +assert.active = 1 +assert.warning = 1 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 0 --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert03.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert03.phpt diff -u php-src/ext/standard/tests/assert/assert03.phpt:1.1 php-src/ext/standard/tests/assert/assert03.phpt:1.2 --- php-src/ext/standard/tests/assert/assert03.phpt:1.1 Fri Dec 8 14:38:53 2006 +++ php-src/ext/standard/tests/assert/assert03.phpt Sun Jan 25 11:03:15 2009 @@ -1,5 +1,11 @@ --TEST-- assert() - set callback using ini_set() +---INI--- +assert.active = 1 +assert.warning = 0 +assert.callback = +assert.bail = 0 +assert.quiet_eval = 1 --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
