[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed May 23 01:31:02 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2696r2=1.2697diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2696 php-src/ChangeLog:1.2697 --- php-src/ChangeLog:1.2696Tue May 22 01:31:03 2007 +++ php-src/ChangeLog Wed May 23 01:31:02 2007 @@ -1,3 +1,231 @@ +2007-05-22 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + new curl constants + +2007-05-22 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_4_4) + main/main.c + main/php_globals.h + main/php_variables.c: + fix for CVE-2007-1285 - crash on deep input variable nesting + +2007-05-22 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/tests/general_functions/gettype_settype_basic.phpt + ext/standard/tests/general_functions/import_request.phpt: + fix test + +2007-05-22 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + Add entry about --ini + +2007-05-22 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/general_functions/gettype_settype_basic.phpt + ext/standard/tests/general_functions/gettype_settype_error.phpt + ext/standard/tests/general_functions/gettype_settype_variation1.phpt + ext/standard/tests/general_functions/gettype_settype_variation2.phpt + ext/standard/tests/general_functions/gettype_settype_variation3.phpt + ext/standard/tests/general_functions/gettype_settype_variation4.phpt + ext/standard/tests/general_functions/gettype_settype_variation5.phpt + ext/standard/tests/general_functions/gettype_settype_variation6.phpt + ext/standard/tests/general_functions/gettype_settype_variation7.phpt + ext/standard/tests/general_functions/gettype_settype_variation8.phpt: + New version of gettype_settype_basic.phpt, + gettype_settype_variation3.phpt, gettype_settype_variation7.phpt, + gettype_settype_error.phpt, gettype_settype_variation4.phpt, + gettype_settype_variation8.phpt, gettype_settype_variation1.phpt, + gettype_settype_variation5.phpt, gettype_settype_variation2.phpt, + gettype_settype_variation6.phpt + +* ext/standard/tests/strings/basename_basic.phpt + ext/standard/tests/strings/basename_error.phpt + ext/standard/tests/strings/basename_variation.phpt: + New version of basename_basic.phpt basename_error.phpt + basename_variation.phpt + +* ext/standard/tests/general_functions/gettype_settype_error.phpt + ext/standard/tests/general_functions/gettype_settype_error.phpt + ext/standard/tests/general_functions/gettype_settype_variation1.phpt + ext/standard/tests/general_functions/gettype_settype_variation1.phpt + ext/standard/tests/general_functions/gettype_settype_variation5.phpt + ext/standard/tests/general_functions/gettype_settype_variation5.phpt + ext/standard/tests/general_functions/gettype_settype_variation8.phpt + ext/standard/tests/general_functions/gettype_settype_variation8.phpt: + + file gettype_settype_error.phpt was initially added on branch PHP_5_2. + +* ext/standard/tests/general_functions/gettype_settype_basic.phpt + ext/standard/tests/general_functions/gettype_settype_basic.phpt + ext/standard/tests/general_functions/gettype_settype_variation2.phpt + ext/standard/tests/general_functions/gettype_settype_variation2.phpt + ext/standard/tests/general_functions/gettype_settype_variation3.phpt + ext/standard/tests/general_functions/gettype_settype_variation3.phpt + ext/standard/tests/general_functions/gettype_settype_variation4.phpt + ext/standard/tests/general_functions/gettype_settype_variation4.phpt + ext/standard/tests/general_functions/gettype_settype_variation6.phpt + ext/standard/tests/general_functions/gettype_settype_variation6.phpt + ext/standard/tests/general_functions/gettype_settype_variation7.phpt + ext/standard/tests/general_functions/gettype_settype_variation7.phpt: + + file gettype_settype_basic.phpt was initially added on branch PHP_5_2. + +* ext/standard/tests/strings/basename_basic.phpt + ext/standard/tests/strings/basename_basic.phpt + ext/standard/tests/strings/basename_error.phpt + ext/standard/tests/strings/basename_error.phpt + ext/standard/tests/strings/basename_variation.phpt + ext/standard/tests/strings/basename_variation.phpt: + + file basename_basic.phpt was initially added on branch PHP_5_2. + +2007-05-22 Hannes Magnusson [EMAIL PROTECTED] + +* ext/standard/credits.c: + Philip, the new phpdoc editor \o/ + +* (PHP_5_2) + ext/standard/credits.c: + Ladies and gentelmens, + I bring you our new documentation editor + Philip Olson! + +* (PHP_5_2) + ext/standard/basic_functions.c + ext/standard/html.c: + Update protoarginfo for
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl interface.c
pollita Tue May 22 08:39:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/curl interface.c Log: MFH(r-1.112) Add CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS option constants http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.25r2=1.62.2.14.2.26diff_format=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.14.2.25 php-src/ext/curl/interface.c:1.62.2.14.2.26 --- php-src/ext/curl/interface.c:1.62.2.14.2.25 Mon Apr 23 14:36:56 2007 +++ php-src/ext/curl/interface.cTue May 22 08:39:20 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: interface.c,v 1.62.2.14.2.25 2007/04/23 14:36:56 tony2001 Exp $ */ +/* $Id: interface.c,v 1.62.2.14.2.26 2007/05/22 08:39:20 pollita Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -387,6 +387,9 @@ REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD); REGISTER_CURL_CONSTANT(CURLOPT_RANGE); REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT); +#ifdef CURLOPT_TIMEOUT_MS + REGISTER_CURL_CONSTANT(CURLOPT_TIMEOUT_MS); +#endif REGISTER_CURL_CONSTANT(CURLOPT_POSTFIELDS); REGISTER_CURL_CONSTANT(CURLOPT_REFERER); REGISTER_CURL_CONSTANT(CURLOPT_USERAGENT); @@ -430,6 +433,9 @@ REGISTER_CURL_CONSTANT(CURLOPT_RANDOM_FILE); REGISTER_CURL_CONSTANT(CURLOPT_EGDSOCKET); REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT); +#ifdef CURLOPT_CONNECTTIMEOUT_MS + REGISTER_CURL_CONSTANT(CURLOPT_CONNECTTIMEOUT_MS); +#endif REGISTER_CURL_CONSTANT(CURLOPT_SSL_VERIFYPEER); REGISTER_CURL_CONSTANT(CURLOPT_CAINFO); REGISTER_CURL_CONSTANT(CURLOPT_CAPATH); @@ -1224,6 +1230,9 @@ case CURLOPT_MUTE: #endif case CURLOPT_TIMEOUT: +#ifdef CURLOPT_TIMEOUT_MS + case CURLOPT_TIMEOUT_MS: +#endif case CURLOPT_FTP_USE_EPSV: case CURLOPT_LOW_SPEED_LIMIT: case CURLOPT_SSLVERSION: @@ -1240,6 +1249,9 @@ case CURLOPT_FRESH_CONNECT: case CURLOPT_FORBID_REUSE: case CURLOPT_CONNECTTIMEOUT: +#ifdef CURLOPT_CONNECTTIMEOUT_MS + case CURLOPT_CONNECTTIMEOUT_MS: +#endif case CURLOPT_SSL_VERIFYHOST: case CURLOPT_SSL_VERIFYPEER: case CURLOPT_DNS_USE_GLOBAL_CACHE: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c /ext/gd/tests bug41442.phpt
tony2001Tue May 22 09:44:55 2007 UTC
Added files:
/php-src/ext/gd/tests bug41442.phpt
Modified files:
/php-src/ext/gd gd.c
Log:
fix #41442 (imagegd2() under output control)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.374r2=1.375diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.374 php-src/ext/gd/gd.c:1.375
--- php-src/ext/gd/gd.c:1.374 Mon May 7 14:50:07 2007
+++ php-src/ext/gd/gd.c Tue May 22 09:44:55 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.374 2007/05/07 14:50:07 pajoye Exp $ */
+/* $Id: gd.c,v 1.375 2007/05/22 09:44:55 tony2001 Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2563,6 +2563,14 @@
}
(*func_p)(im, fp);
break;
+#ifdef HAVE_GD_GD2
+ case PHP_GDIMG_TYPE_GD2:
+ if (quality == -1) {
+ quality = 128;
+ }
+ (*func_p)(im, fp, quality, type);
+ break;
+#endif
default:
if (quality == -1) {
quality = 128;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug41442.phpt?view=markuprev=1.1
Index: php-src/ext/gd/tests/bug41442.phpt
+++ php-src/ext/gd/tests/bug41442.phpt
--TEST--
Bug #41442 (imagegd2() under output control)
--SKIPIF--
?php
if (!extension_loaded('gd')) {
die(skip gd extension not available.);
}
if (!function_exists(imagegd2)) {
die(skip GD2 support unavailable);
}
?
--FILE--
?php
$str = file_get_contents(dirname(__FILE__).'/src.gd2');
$res = imagecreatefromstring($str);
/* string */
ob_start();
imagegd2($res);
$str2 = ob_get_clean();
var_dump(imagecreatefromstring($str2));
/* file */
$file = dirname(__FILE__)./bug41442.gd2;
imagegd2($res, $file);
$str2 = file_get_contents($file);
var_dump(imagecreatefromstring($str2));
@unlink($file);
echo Done\n;
?
--EXPECTF--
resource(%d) of type (gd)
resource(%d) of type (gd)
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/sybase_ct/tests bug26407.phpt test_fetch_object.phpt test_msghandler.phpt test_unbuffered_query.phpt
thekid Tue May 22 11:33:36 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/testsbug26407.phpt test_fetch_object.phpt
test_msghandler.phpt
test_unbuffered_query.phpt
Log:
- Fixed tests on Windows
# The tests expected %s/test.inc in warnings and notices, but of course,
# on Windows, the directory separator is a backslash.
# Made this work in both worlds by testing for %stest.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug26407.phpt?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug26407.phpt
diff -u php-src/ext/sybase_ct/tests/bug26407.phpt:1.2
php-src/ext/sybase_ct/tests/bug26407.phpt:1.2.4.1
--- php-src/ext/sybase_ct/tests/bug26407.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug26407.phpt Tue May 22 11:33:36 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug26407.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug26407.phpt,v 1.2.4.1 2007/05/22 11:33:36 thekid Exp $
*/
require('test.inc');
@@ -80,7 +80,7 @@
select bar
-Notice: sybase_query(): Sybase: Unexpected results, cancelling current in
%s/test.inc on line %d
+Notice: sybase_query(): Sybase: Unexpected results, cancelling current in
%stest.inc on line %d
Return: resource
array(1) {
[0]=
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_fetch_object.phpt?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/sybase_ct/tests/test_fetch_object.phpt
diff -u php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.1
php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.2
--- php-src/ext/sybase_ct/tests/test_fetch_object.phpt:1.1.6.1 Wed Mar 14
11:44:24 2007
+++ php-src/ext/sybase_ct/tests/test_fetch_object.phpt Tue May 22 11:33:36 2007
@@ -8,7 +8,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_fetch_object.phpt,v 1.1.6.1 2007/03/14 11:44:24 thekid Exp $
+ * $Id: test_fetch_object.phpt,v 1.1.6.2 2007/05/22 11:33:36 thekid Exp $
*/
require('test.inc');
@@ -65,7 +65,7 @@
'lastchange' = '%s',
))
-Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in
%s/test_fetch_object.php on line %d
+Notice: sybase_fetch_object(): Sybase: Class *** has not been declared in
%stest_fetch_object.php on line %d
stdClass::__set_state(array(
'id' = 1,
'caption' = 'Hello',
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_msghandler.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2
php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2.6.1
--- php-src/ext/sybase_ct/tests/test_msghandler.phpt:1.2Sun Jan 25
20:04:08 2004
+++ php-src/ext/sybase_ct/tests/test_msghandler.phptTue May 22 11:33:36 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler.phpt,v 1.2 2004/01/25 20:04:08 thekid Exp $
+ * $Id: test_msghandler.phpt,v 1.2.6.1 2007/05/22 11:33:36 thekid Exp $
*/
require('test.inc');
@@ -26,14 +26,14 @@
?
--EXPECTF--
Nonexistant:
-Warning: sybase_set_message_handler(): First argumented is expected to be a
valid callback, 'function_does_not_exist' was given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be a
valid callback, 'function_does_not_exist' was given in %stest.inc on line %d
bool(false)
Static method: bool(true)
Instance method: bool(true)
Lambda function: bool(true)
Unset: bool(true)
Incorrect type:
-Warning: sybase_set_message_handler(): First argumented is expected to be
either NULL, an array or string, integer given in %s/test.inc on line %d
+Warning: sybase_set_message_handler(): First argumented is expected to be
either NULL, an array or string, integer given in %stest.inc on line %d
bool(false)
Function:bool(true)
Query: select getdate(NULL)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt
diff -u php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3
php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3.6.1
--- php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt:1.3 Fri May 21
21:01:21 2004
+++ php-src/ext/sybase_ct/tests/test_unbuffered_query.phpt Tue May 22
11:33:36 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_unbuffered_query.phpt,v 1.3 2004/05/21 21:01:21 thekid Exp $
+ * $Id: test_unbuffered_query.phpt,v 1.3.6.1 2007/05/22 11:33:36 thekid Exp $
*/
require('test.inc');
@@ -49,7 +49,7 @@
resource(%d) of type (sybase-ct result)
resource(%d) of type
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests bug22403.phpt bug27843.phpt bug28354.phpt
thekid Tue May 22 11:35:47 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/testsbug27843.phpt bug22403.phpt
bug28354.phpt
Log:
- Changed hardcoded tempdb database name to a constant
# This constant is defined in test.inc and defaults to tempdb
# In certain setups, create procedure permissions may not be granted
# in tempdb
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug27843.phpt?r1=1.3r2=1.3.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug27843.phpt
diff -u php-src/ext/sybase_ct/tests/bug27843.phpt:1.3
php-src/ext/sybase_ct/tests/bug27843.phpt:1.3.4.1
--- php-src/ext/sybase_ct/tests/bug27843.phpt:1.3 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug27843.phpt Tue May 22 11:35:47 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug27843.phpt,v 1.3 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug27843.phpt,v 1.3.4.1 2007/05/22 11:35:47 thekid Exp $
*/
require('test.inc');
@@ -15,7 +15,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug27843';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id('.$sp_name.')')) {
echo Stored procedure {$sp_name} not found, creating\n;
var_dump(sybase_query('
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug22403.phpt?r1=1.2r2=1.2.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug22403.phpt
diff -u php-src/ext/sybase_ct/tests/bug22403.phpt:1.2
php-src/ext/sybase_ct/tests/bug22403.phpt:1.2.4.1
--- php-src/ext/sybase_ct/tests/bug22403.phpt:1.2 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug22403.phpt Tue May 22 11:35:47 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug22403.phpt,v 1.2 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug22403.phpt,v 1.2.4.1 2007/05/22 11:35:47 thekid Exp $
*/
require('test.inc');
@@ -17,7 +17,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug22403';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id('.$sp_name.')')) {
echo Stored procedure {$sp_name} not found, creating\n;
var_dump(sybase_query('
@@ -63,7 +63,7 @@
Return: boolean
bool(false)
Query: exec does_not_exist
-*** Caught Sybase Server Message #2812 [Severity 16, state 4] at line 1
+*** Caught Sybase Server Message #2812 [Severity 16, state %d] at line 1
%s
Return: boolean
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/bug28354.phpt?r1=1.3r2=1.3.4.1diff_format=u
Index: php-src/ext/sybase_ct/tests/bug28354.phpt
diff -u php-src/ext/sybase_ct/tests/bug28354.phpt:1.3
php-src/ext/sybase_ct/tests/bug28354.phpt:1.3.4.1
--- php-src/ext/sybase_ct/tests/bug28354.phpt:1.3 Sun Feb 6 12:59:03 2005
+++ php-src/ext/sybase_ct/tests/bug28354.phpt Tue May 22 11:35:47 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: bug28354.phpt,v 1.3 2005/02/06 12:59:03 thekid Exp $
+ * $Id: bug28354.phpt,v 1.3.4.1 2007/05/22 11:35:47 thekid Exp $
*/
require('test.inc');
@@ -17,7 +17,7 @@
// Check if stored procedure already exists
$sp_name= 'phpt_bug28354';
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
if (!sybase_select_single($db, 'select object_id('.$sp_name.')')) {
echo Stored procedure {$sp_name} not found, creating\n;
var_dump(sybase_query('
--
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/sybase_ct/tests test.inc
thekid Tue May 22 11:36:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/teststest.inc
Log:
- Added constant TEMPDB, defaulting to tempdb
# This constant is used by some of the tests and should point
# to a database where the user has create proc|table permissions
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.4.6.2r2=1.4.6.3diff_format=u
Index: php-src/ext/sybase_ct/tests/test.inc
diff -u php-src/ext/sybase_ct/tests/test.inc:1.4.6.2
php-src/ext/sybase_ct/tests/test.inc:1.4.6.3
--- php-src/ext/sybase_ct/tests/test.inc:1.4.6.2Sun Mar 11 12:56:44 2007
+++ php-src/ext/sybase_ct/tests/test.incTue May 22 11:36:55 2007
@@ -1,13 +1,14 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test.inc,v 1.4.6.2 2007/03/11 12:56:44 tony2001 Exp $
+ * $Id: test.inc,v 1.4.6.3 2007/05/22 11:36:55 thekid Exp $
*/
// Change if needed
define('HOST', '');
define('USER', '');
define('PASSWORD', '');
+ define('TEMPDB', 'tempdb');
// {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int
line, string text)
// Handles server messages
--
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/sybase_ct/tests test_msghandler_handled.phpt
thekid Tue May 22 11:38:57 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/teststest_msghandler_handled.phpt
Log:
- Fixed expectancy in for SQL query select convert(datetime, notadate)
This query should return bool(false) and not a resource() because
the above is a syntax error
# Exact message yielded by SQL server is the following:
# Syntax error during explicit conversion of VARCHAR value `notadate`
# to a DATETIME field.
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt
diff -u php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.1.6.1
php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.1.6.2
--- php-src/ext/sybase_ct/tests/test_msghandler_handled.phpt:1.1.6.1Wed Mar
14 11:57:45 2007
+++ php-src/ext/sybase_ct/tests/test_msghandler_handled.phptTue May 22
11:38:57 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_msghandler_handled.phpt,v 1.1.6.1 2007/03/14 11:57:45 thekid Exp $
+ * $Id: test_msghandler_handled.phpt,v 1.1.6.2 2007/05/22 11:38:57 thekid Exp $
*/
require('test.inc');
@@ -65,6 +65,5 @@
Warning: sybase_query(): Sybase: Server message: Syntax error during
explicit conversion of VARCHAR value 'notadate' to a DATETIME field.
(severity 16, procedure N/A) in %s on line %d
- Return: resource
-array(0) {
-}
+ Return: boolean
+bool(false)
--
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/sybase_ct/tests test_long.phpt
thekid Tue May 22 12:16:32 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/teststest_long.phpt
Log:
- Changed hardcoded tempdb database name to a constant
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test_long.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/sybase_ct/tests/test_long.phpt
diff -u php-src/ext/sybase_ct/tests/test_long.phpt:1.1
php-src/ext/sybase_ct/tests/test_long.phpt:1.1.6.1
--- php-src/ext/sybase_ct/tests/test_long.phpt:1.1 Sun May 16 20:28:31 2004
+++ php-src/ext/sybase_ct/tests/test_long.phpt Tue May 22 12:16:32 2007
@@ -6,7 +6,7 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test_long.phpt,v 1.1 2004/05/16 20:28:31 thekid Exp $
+ * $Id: test_long.phpt,v 1.1.6.1 2007/05/22 12:16:32 thekid Exp $
*/
require('test.inc');
@@ -15,7 +15,7 @@
define('LONG_MIN', -LONG_MAX - 1);
$db= sybase_connect_ex();
- var_dump(sybase_select_db('tempdb', $db));
+ var_dump(sybase_select_db(TEMPDB, $db));
// Create table and insert some values
var_dump(sybase_query('create table test_long (value numeric(20, 0))'));
--
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) / NEWS /ext/standard html.c html.h /ext/standard/tests/strings htmlentities18.phpt
iliaa Tue May 22 12:37:01 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings htmlentities18.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard html.c html.h
Log:
[DOC] Added a 4th parameter flag to htmlspecialchars() and htmlentities()
that makes the function not encode existing html entities. The feature is
disabled by default and can be activated by passing FALSE as the 4th param
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.727r2=1.2027.2.547.2.728diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.727 php-src/NEWS:1.2027.2.547.2.728
--- php-src/NEWS:1.2027.2.547.2.727 Tue May 22 10:22:47 2007
+++ php-src/NEWSTue May 22 12:37:00 2007
@@ -5,6 +5,8 @@
- Optimized out a couple of per-request syscalls (Rasmus)
- Optimized digest generation in md5() and sha1() functions. (Ilia)
- Upgraded SQLite 3 to version 3.3.16 (Ilia)
+- Added a 4th parameter flag to htmlspecialchars() and htmlentities() that
+ makes the function not encode existing html entities. (Ilia)
- Added PDO::FETCH_KEY_PAIR mode that will fetch a 2 column result set into
an associated array. (Ilia)
- Added function mysql_set_charset(). Allows connection encoding to be
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.9r2=1.111.2.2.2.10diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.9
php-src/ext/standard/html.c:1.111.2.2.2.10
--- php-src/ext/standard/html.c:1.111.2.2.2.9 Tue Feb 27 03:28:16 2007
+++ php-src/ext/standard/html.c Tue May 22 12:37:00 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.111.2.2.2.9 2007/02/27 03:28:16 iliaa Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.10 2007/05/22 12:37:00 iliaa Exp $ */
/*
* HTML entity resources:
@@ -1078,12 +1078,15 @@
}
/* }}} */
-
+PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int
*newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
+{
+ return php_escape_html_entities_ex(old, oldlen, newlen, all,
quote_style, hint_charset, 1 TSRMLS_CC);
+}
/* {{{ php_escape_html_entities
*/
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int
*newlen, int all, int quote_style, char *hint_charset TSRMLS_DC)
+PHPAPI char *php_escape_html_entities_ex(unsigned char *old, int oldlen, int
*newlen, int all, int quote_style, char *hint_charset, zend_bool double_encode
TSRMLS_DC)
{
int i, j, maxlen, len;
char *replaced;
@@ -1145,8 +1148,34 @@
int is_basic = 0;
if (this_char == '') {
- memcpy(replaced + len, amp;, sizeof(amp;)
- 1);
- len += sizeof(amp;) - 1;
+ if (double_encode) {
+encode_amp:
+ memcpy(replaced + len, amp;,
sizeof(amp;) - 1);
+ len += sizeof(amp;) - 1;
+ } else {
+ char *e = memchr(old + i, ';', len - i);
+ char *s = old + i + 1;
+
+ if (!e || (e - s) 10) { /* minor
optimization to avoid entities over 10 chars in length */
+ goto encode_amp;
+ } else {
+ if (*s == '#') { /* numeric
entities */
+ s++;
+ while (s e) {
+ if
(!isdigit(*s++)) {
+ goto
encode_amp;
+ }
+ }
+ } else { /* text entities */
+ while (s e) {
+ if
(!isalnum(*s++)) {
+ goto
encode_amp;
+ }
+ }
+ }
+ replaced[len++] = '';
+ }
+ }
is_basic = 1;
} else {
for (j = 0; basic_entities[j].charcode != 0;
j++) {
@@ -1193,12 +1222,13 @@
int len;
long quote_style = ENT_COMPAT;
char
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended
bjori Tue May 22 13:28:49 2007 UTC Modified files: /php-srcphp.ini-dist php.ini-recommended Log: MFB: max_input_nesting_level http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.263r2=1.264diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.263 php-src/php.ini-dist:1.264 --- php-src/php.ini-dist:1.263 Thu Apr 26 09:39:03 2007 +++ php-src/php.ini-distTue May 22 13:28:49 2007 @@ -201,6 +201,7 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60; Maximum amount of time each script may spend parsing request data +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.212r2=1.213diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.212 php-src/php.ini-recommended:1.213 --- php-src/php.ini-recommended:1.212 Thu Apr 26 09:39:03 2007 +++ php-src/php.ini-recommended Tue May 22 13:28:49 2007 @@ -234,6 +234,7 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60; Maximum amount of time each script may spend parsing request data +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) -- 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) / php.ini-dist php.ini-recommended
bjori Tue May 22 13:27:17 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcphp.ini-dist php.ini-recommended Log: Add max_input_nesting_level http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.17r2=1.231.2.10.2.18diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.17 php-src/php.ini-dist:1.231.2.10.2.18 --- php-src/php.ini-dist:1.231.2.10.2.17Thu Apr 12 12:31:39 2007 +++ php-src/php.ini-distTue May 22 13:27:16 2007 @@ -254,6 +254,7 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60; Maximum amount of time each script may spend parsing request data +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.17r2=1.179.2.11.2.18diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.17 php-src/php.ini-recommended:1.179.2.11.2.18 --- php-src/php.ini-recommended:1.179.2.11.2.17 Thu Apr 12 12:31:39 2007 +++ php-src/php.ini-recommended Tue May 22 13:27:16 2007 @@ -299,6 +299,7 @@ max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60; Maximum amount of time each script may spend parsing request data +;max_input_nesting_level = 64 ; Maximum input variable nesting level memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c php_var.h /ext/standard/tests/general_functions import_request1.phpt import_request2.phpt import_request3.phpt
tony2001Tue May 22 14:32:40 2007 UTC
Added files:
/php-src/ext/standard/tests/general_functions import_request1.phpt
import_request2.phpt
import_request3.phpt
Modified files:
/php-src/ext/standard basic_functions.c php_var.h
Log:
improve variable name checks
add more tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.857r2=1.858diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.857
php-src/ext/standard/basic_functions.c:1.858
--- php-src/ext/standard/basic_functions.c:1.857Fri May 18 12:15:01 2007
+++ php-src/ext/standard/basic_functions.c Tue May 22 14:32:39 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.857 2007/05/18 12:15:01 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.858 2007/05/22 14:32:39 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -6321,16 +6321,10 @@
prefix = va_arg(args, zval *);
prefix_len = Z_UNILEN_P(prefix);
- if (!prefix_len) {
- if (!hash_key-nKeyLength) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Numeric
key detected - possible security hazard);
- return 0;
- } else if (hash_key-nKeyLength == sizeof(GLOBALS)
- ZEND_U_EQUAL(hash_key-type, hash_key-arKey,
hash_key-nKeyLength-1, GLOBALS, sizeof(GLOBALS)-1)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempted
GLOBALS variable overwrite);
- return 0;
- }
- }
+ if (!prefix_len !hash_key-nKeyLength) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Numeric key
detected - possible security hazard);
+ return 0;
+ }
if (hash_key-nKeyLength) {
php_prefix_varname(new_key, prefix, hash_key-arKey,
hash_key-nKeyLength-1, hash_key-type, 0 TSRMLS_CC);
@@ -6342,6 +6336,11 @@
zval_dtor(num);
}
+ if (php_varname_check(Z_TYPE(new_key), Z_UNIVAL(new_key),
Z_UNILEN(new_key), 0 TSRMLS_CC) == FAILURE) {
+ zval_dtor(new_key);
+ return 0;
+ }
+
zend_u_delete_global_variable(Z_TYPE(new_key), Z_UNIVAL(new_key),
Z_UNILEN(new_key) TSRMLS_CC);
ZEND_U_SET_SYMBOL_WITH_LENGTH(EG(symbol_table), Z_TYPE(new_key),
Z_UNIVAL(new_key), Z_UNILEN(new_key) + 1, *var, (*var)-refcount+1, 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_var.h?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/standard/php_var.h
diff -u php-src/ext/standard/php_var.h:1.37 php-src/ext/standard/php_var.h:1.38
--- php-src/ext/standard/php_var.h:1.37 Mon Jan 1 09:29:32 2007
+++ php-src/ext/standard/php_var.h Tue May 22 14:32:39 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_var.h,v 1.37 2007/01/01 09:29:32 sebastian Exp $ */
+/* $Id: php_var.h,v 1.38 2007/05/22 14:32:39 tony2001 Exp $ */
#ifndef PHP_VAR_H
#define PHP_VAR_H
@@ -68,4 +68,101 @@
PHPAPI zend_class_entry *php_create_empty_class(char *class_name, int len);
+static inline int php_varname_check_string(char * name, int name_len,
zend_bool silent TSRMLS_DC) /* {{{ */
+{
+ if (name_len == sizeof(GLOBALS)-1 !memcmp(name, GLOBALS,
sizeof(GLOBALS)-1)) {
+ if (!silent) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempted
GLOBALS variable overwrite);
+ }
+ return FAILURE;
+ } else if (name[0] == '_'
+ (
+(name_len == sizeof(_GET)-1 !memcmp(name,
_GET, sizeof(_GET))) ||
+(name_len == sizeof(_POST)-1
!memcmp(name, _POST, sizeof(_POST))) ||
+(name_len == sizeof(_COOKIE)-1
!memcmp(name, _COOKIE, sizeof(_COOKIE))) ||
+(name_len == sizeof(_ENV)-1 !memcmp(name,
_ENV, sizeof(_ENV))) ||
+(name_len == sizeof(_SERVER)-1
!memcmp(name, _SERVER, sizeof(_SERVER))) ||
+(name_len == sizeof(_SESSION)-1
!memcmp(name, _SESSION, sizeof(_SESSION))) ||
+(name_len == sizeof(_FILES)-1
!memcmp(name, _FILES, sizeof(_FILES))) ||
+(name_len == sizeof(_REQUEST)-1
!memcmp(name, _REQUEST, sizeof(_REQUEST)))
+ )
+ ) {
+ if (!silent) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Attempted super-global (%s) variable overwrite, name);
+
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard basic_functions.c php_var.h /ext/standard/tests/general_functions import_request1.phpt import_request2.phpt import_request3.phpt
tony2001Tue May 22 14:34:23 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/general_functions import_request1.phpt
import_request2.phpt
import_request3.phpt
Modified files:
/php-src/ext/standard basic_functions.c php_var.h
Log:
MFH: improve variable name checks
add more tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.51r2=1.725.2.31.2.52diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.51
php-src/ext/standard/basic_functions.c:1.725.2.31.2.52
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.51 Thu May 17
06:38:13 2007
+++ php-src/ext/standard/basic_functions.c Tue May 22 14:34:22 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.51 2007/05/17 06:38:13 rasmus Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.52 2007/05/22 14:34:22 tony2001 Exp $
*/
#include php.h
#include php_streams.h
@@ -6261,51 +6261,25 @@
prefix = va_arg(args, char *);
prefix_len = va_arg(args, uint);
- if (!prefix_len) {
- if (!hash_key-nKeyLength) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Numeric
key detected - possible security hazard.);
- return 0;
- } else if (!strcmp(hash_key-arKey, GLOBALS)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempted
GLOBALS variable overwrite.);
- return 0;
- } else if (*hash_key-arKey == '_'
- (
- !strcmp(hash_key-arKey, _GET) ||
- !strcmp(hash_key-arKey, _POST) ||
- !strcmp(hash_key-arKey, _COOKIE) ||
- !strcmp(hash_key-arKey, _ENV) ||
- !strcmp(hash_key-arKey, _SERVER) ||
- !strcmp(hash_key-arKey, _SESSION) ||
- !strcmp(hash_key-arKey, _FILES) ||
- !strcmp(hash_key-arKey, _REQUEST)
- )
- ) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempted
super-global (%s) variable overwrite., hash_key-arKey);
- return 0;
- } else if (*hash_key-arKey == 'H'
- (
- !strcmp(hash_key-arKey,
HTTP_POST_VARS) ||
- !strcmp(hash_key-arKey,
HTTP_GET_VARS) ||
- !strcmp(hash_key-arKey,
HTTP_COOKIE_VARS) ||
- !strcmp(hash_key-arKey,
HTTP_ENV_VARS) ||
- !strcmp(hash_key-arKey,
HTTP_SERVER_VARS) ||
- !strcmp(hash_key-arKey,
HTTP_RAW_POST_DATA) ||
- !strcmp(hash_key-arKey,
HTTP_POST_FILES)
- )
- ) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempted
long input array (%s) overwrite., hash_key-arKey);
- return 0;
- }
+ if (!prefix_len !hash_key-nKeyLength) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Numeric key
detected - possible security hazard.);
+ return 0;
}
if (hash_key-nKeyLength) {
new_key_len = prefix_len + hash_key-nKeyLength;
- new_key = (char *) emalloc(new_key_len);
+ new_key = (char *) emalloc(new_key_len); /* +1 comes from
nKeyLength */
memcpy(new_key, prefix, prefix_len);
memcpy(new_key+prefix_len, hash_key-arKey,
hash_key-nKeyLength);
} else {
new_key_len = spprintf(new_key, 0, %s%ld, prefix,
hash_key-h);
+ new_key_len++;
+ }
+
+ if (php_varname_check(new_key, new_key_len, 0 TSRMLS_CC) == FAILURE) {
+ efree(new_key);
+ return 0;
}
zend_delete_global_variable(new_key, new_key_len-1 TSRMLS_CC);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_var.h?r1=1.30.2.1.2.5r2=1.30.2.1.2.6diff_format=u
Index: php-src/ext/standard/php_var.h
diff -u php-src/ext/standard/php_var.h:1.30.2.1.2.5
php-src/ext/standard/php_var.h:1.30.2.1.2.6
--- php-src/ext/standard/php_var.h:1.30.2.1.2.5 Mon Jan 1 09:36:08 2007
+++ php-src/ext/standard/php_var.h Tue May 22 14:34:22 2007
@@ -16,7 +16,7 @@
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
pajoye Tue May 22 15:17:03 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - add cve ref http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.728r2=1.2027.2.547.2.729diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.728 php-src/NEWS:1.2027.2.547.2.729 --- php-src/NEWS:1.2027.2.547.2.728 Tue May 22 12:37:00 2007 +++ php-src/NEWSTue May 22 15:17:03 2007 @@ -15,7 +15,7 @@ always_populate_raw_post_data is off. (Ilia) - Implemented FR #41416 (getColumnMeta() should also return table name). (Tony) - Fixed possible infinite loop in imagecreatefrompng (libgd #86) - (by Xavier Roche) (Pierre) + (by Xavier Roche, CVE-2007-2756) (Pierre) - Fixed ext/filter Email Validation Vulnerability (MOPB-45 by Stefan Esser) (Ilia) - Fixed altering $this via argument named this. (Dmitry) -- 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 credits.c
bjori Tue May 22 15:44:12 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard credits.c Log: Ladies and gentelmens, I bring you our new documentation editor Philip Olson! http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.36.2.4.2.3r2=1.36.2.4.2.4diff_format=u Index: php-src/ext/standard/credits.c diff -u php-src/ext/standard/credits.c:1.36.2.4.2.3 php-src/ext/standard/credits.c:1.36.2.4.2.4 --- php-src/ext/standard/credits.c:1.36.2.4.2.3 Mon Jan 1 09:36:08 2007 +++ php-src/ext/standard/credits.c Tue May 22 15:44:11 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: credits.c,v 1.36.2.4.2.3 2007/01/01 09:36:08 sebastian Exp $ */ +/* $Id: credits.c,v 1.36.2.4.2.4 2007/05/22 15:44:11 bjori Exp $ */ #include php.h #include info.h @@ -97,6 +97,7 @@ php_info_print_table_start(); php_info_print_table_colspan_header(2, PHP Documentation); CREDIT_LINE(Authors, Mehdi Achour, Friedhelm Betz, Antony Dovgal, Nuno Lopes, Philip Olson, Georg Richter, Damien Seguy, Jakub Vrana); + CREDIT_LINE(Editor, Philip Olson); CREDIT_LINE(User Note Maintainers, Mehdi Achour, Friedhelm Betz, Vincent Gevers, Aidan Lister, Nuno Lopes, Tom Sommer); CREDIT_LINE(Other Contributors, Previously active authors, editors and other contributors are listed in the manual.); php_info_print_table_end(); -- 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 basic_functions.c html.c
bjori Tue May 22 15:38:27 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard html.c basic_functions.c
Log:
Update protoarginfo for double_encode in htmlspecialchars()htmlentities()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.10r2=1.111.2.2.2.11diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.10
php-src/ext/standard/html.c:1.111.2.2.2.11
--- php-src/ext/standard/html.c:1.111.2.2.2.10 Tue May 22 12:37:00 2007
+++ php-src/ext/standard/html.c Tue May 22 15:38:27 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.111.2.2.2.10 2007/05/22 12:37:00 iliaa Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.11 2007/05/22 15:38:27 bjori Exp $ */
/*
* HTML entity resources:
@@ -1248,7 +1248,7 @@
}
/* }}} */
-/* {{{ proto string htmlspecialchars(string string [, int quote_style][,
string charset])
+/* {{{ proto string htmlspecialchars(string string [, int quote_style[, string
charset[, bool double_encode]]])
Convert special characters to HTML entities */
PHP_FUNCTION(htmlspecialchars)
{
@@ -1345,7 +1345,7 @@
/* }}} */
-/* {{{ proto string htmlentities(string string [, int quote_style][, string
charset])
+/* {{{ proto string htmlentities(string string [, int quote_style[, string
charset[, bool double_encode]]])
Convert all applicable characters to HTML entities */
PHP_FUNCTION(htmlentities)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.52r2=1.725.2.31.2.53diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.52
php-src/ext/standard/basic_functions.c:1.725.2.31.2.53
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.52 Tue May 22
14:34:22 2007
+++ php-src/ext/standard/basic_functions.c Tue May 22 15:38:27 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.52 2007/05/22 14:34:22 tony2001 Exp $
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.53 2007/05/22 15:38:27 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -1665,6 +1665,7 @@
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, quote_style)
ZEND_ARG_INFO(0, charset)
+ ZEND_ARG_INFO(0, double_encode)
ZEND_END_ARG_INFO()
static
@@ -1685,6 +1686,7 @@
ZEND_ARG_INFO(0, string)
ZEND_ARG_INFO(0, quote_style)
ZEND_ARG_INFO(0, charset)
+ ZEND_ARG_INFO(0, double_encode)
ZEND_END_ARG_INFO()
static
--
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/strings basename_basic.phpt basename_error.phpt basename_variation.phpt
kraghubaTue May 22 15:59:04 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings basename_basic.phpt basename_variation.phpt basename_error.phpt Log: New version of basename_basic.phpt, basename_error.phpt, basename_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/basename_basic.phpt +++ php-src/ext/standard/tests/strings/basename_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename_variation.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/basename_variation.phpt +++ php-src/ext/standard/tests/strings/basename_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/basename_error.phpt +++ php-src/ext/standard/tests/strings/basename_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 gettype_settype_basic.phpt gettype_settype_error.phpt gettype_settype_variation1.phpt gettype_settype_variation2.phpt gettype_sett
kraghubaTue May 22 16:01:59 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions gettype_settype_variation3.phpt gettype_settype_variation4.phpt gettype_settype_variation6.phpt gettype_settype_basic.phpt gettype_settype_variation7.phpt gettype_settype_variation2.phpt gettype_settype_error.phpt gettype_settype_variation8.phpt gettype_settype_variation5.phpt gettype_settype_variation1.phpt Log: New version of gettype_settype_variation1.phpt gettype_settype_variation6.phpt gettype_settype_variation2.phpt gettype_settype_variation7.phpt gettype_settype_variation3.phpt gettype_settype_variation8.phpt gettype_settype_basic.phpt gettype_settype_variation4.phpt gettype_settype_error.phpt gettype_settype_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation6.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation7.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation8.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation8.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation1.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/tests/strings basename_basic.phpt basename_error.phpt basename_variation.phpt
kraghubaTue May 22 16:03:57 2007 UTC Modified files: /php-src/ext/standard/tests/strings basename_error.phpt basename_variation.phpt basename_basic.phpt Log: New version of basename_basic.phpt basename_error.phpt basename_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename_error.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/strings/basename_error.phpt diff -u /dev/null php-src/ext/standard/tests/strings/basename_error.phpt:1.2 --- /dev/null Tue May 22 16:03:57 2007 +++ php-src/ext/standard/tests/strings/basename_error.phpt Tue May 22 16:03:57 2007 @@ -0,0 +1,88 @@ +--TEST-- +Test basename() function : error conditions +--FILE-- +?php +/* Prototype: string basename ( string $path [, string $suffix] ); + Description: Given a string containing a path to a file, +this function will return the base name of the file. +If the filename ends in suffix this will also be cut off. +*/ +echo *** Testing error conditions ***\n; +// zero arguments +var_dump( basename() ); + +// more than expected no. of arguments +var_dump( basename(/var/tmp/bar.gz, .gz, .gz) ); + +// passing invalid type arguments +$object = new stdclass; +var_dump( basename( array(string/bar) ) ); +var_dump( basename( array(string/bar), bar ) ); +var_dump( basename( bar, array(string/bar) ) ); +var_dump( basename( $object, bar ) ); +var_dump( basename( $object ) ); +var_dump( basename( $object, $object ) ); +var_dump( basename( bar, $object ) ); + +echo Done\n; +? +--EXPECTF-- +*** Testing error conditions *** + +Warning: basename() expects at least 1 parameter, 0 given in %s on line %d +NULL + +Warning: basename() expects at most 2 parameters, 3 given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 2 to be string (Unicode or binary), object given in %s on line %d +NULL +Done +--UEXPECTF-- +*** Testing error conditions *** + +Warning: basename() expects at least 1 parameter, 0 given in %s on line %d +NULL + +Warning: basename() expects at most 2 parameters, 3 given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 1 to be string (Unicode or binary), object given in %s on line %d +NULL + +Warning: basename() expects parameter 2 to be string (Unicode or binary), object given in %s on line %d +NULL +Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/basename_variation.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/strings/basename_variation.phpt diff -u /dev/null php-src/ext/standard/tests/strings/basename_variation.phpt:1.2 --- /dev/null Tue May 22 16:03:57 2007 +++ php-src/ext/standard/tests/strings/basename_variation.phpt Tue May 22 16:03:57 2007 @@ -0,0 +1,382 @@ +--TEST-- +Test basename() function : usage variations +--FILE-- +?php +/* Prototype: string basename ( string $path [, string $suffix] ); + Description: Given a string containing a path to a file, +this function will return the base name of the file. +If the filename ends in suffix this will also be cut off. +*/ +$file_path_variations = array ( + /* paths with shortcut home dir char, with suffix variation */ + array(~/home/user/bar), + array(~/home/user/bar, ), + array(~/home/user/bar, NULL), + array(~/home/user/bar, ' '), + array(~/home/user/bar.tar, .tar), + array(~/home/user/bar.tar, ~), + array(~/home/user/bar.tar/, ~), + array(~/home/user/bar.tar/, ), + array(~/home/user/bar.tar, NULL), + array(~/home/user/bar.tar, ''), + array(~/home/user/bar.tar, ), + + /* paths with hostname:dir notation, with suffix variation */
[PHP-CVS] cvs: php-src /ext/standard credits.c
bjori Tue May 22 15:46:27 2007 UTC Modified files: /php-src/ext/standard credits.c Log: Philip, the new phpdoc editor \o/ http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.45r2=1.46diff_format=u Index: php-src/ext/standard/credits.c diff -u php-src/ext/standard/credits.c:1.45 php-src/ext/standard/credits.c:1.46 --- php-src/ext/standard/credits.c:1.45 Mon Jan 1 09:29:30 2007 +++ php-src/ext/standard/credits.c Tue May 22 15:46:27 2007 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: credits.c,v 1.45 2007/01/01 09:29:30 sebastian Exp $ */ +/* $Id: credits.c,v 1.46 2007/05/22 15:46:27 bjori Exp $ */ #include php.h #include info.h @@ -108,6 +108,7 @@ php_info_print_table_start(); php_info_print_table_colspan_header(2, PHP Documentation); CREDIT_LINE(Authors, Mehdi Achour, Friedhelm Betz, Antony Dovgal, Nuno Lopes, Philip Olson, Georg Richter, Damien Seguy, Jakub Vrana); + CREDIT_LINE(Editor, Philip Olson); CREDIT_LINE(User Note Maintainers, Mehdi Achour, Friedhelm Betz, Vincent Gevers, Aidan Lister, Nuno Lopes, Tom Sommer); CREDIT_LINE(Other Contributors, Previously active authors, editors and other contributors are listed in the manual.); php_info_print_table_end(); -- 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) / NEWS
bjori Tue May 22 16:38:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Add entry about --ini http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.729r2=1.2027.2.547.2.730diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.729 php-src/NEWS:1.2027.2.547.2.730 --- php-src/NEWS:1.2027.2.547.2.729 Tue May 22 15:17:03 2007 +++ php-src/NEWSTue May 22 16:38:50 2007 @@ -9,6 +9,7 @@ makes the function not encode existing html entities. (Ilia) - Added PDO::FETCH_KEY_PAIR mode that will fetch a 2 column result set into an associated array. (Ilia) +- Added --ini switch to CLI that prints out configuration file names. (Marcus) - Added function mysql_set_charset(). Allows connection encoding to be altered at run time. (Scott) - Allow SOAP extension's handler() to work even when -- 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 import_request.phpt
tony2001Tue May 22 16:52:58 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions import_request.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/import_request.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/general_functions/import_request.phpt diff -u php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.2 php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.3 --- php-src/ext/standard/tests/general_functions/import_request.phpt:1.1.2.2 Thu Nov 16 13:01:23 2006 +++ php-src/ext/standard/tests/general_functions/import_request.phptTue May 22 16:52:58 2007 @@ -37,7 +37,7 @@ Notice: import_request_variables(): No prefix specified - possible security hazard in %s on line %d -Warning: import_request_variables(): Attempted GLOBALS variable overwrite. in %s on line %d +Warning: import_request_variables(): Attempted GLOBALS variable overwrite in %s on line %d Warning: import_request_variables(): Numeric key detected - possible security hazard. in %s on line %d NULL @@ -50,13 +50,11 @@ NULL Notice: Undefined variable: g_ap in %s on line %d - -Notice: Undefined variable: g_1 in %s on line %d string(1) 1 string(3) heh string(1) 3 NULL -NULL +string(2) hm NULL string(1) 1 string(3) heh -- 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 gettype_settype_variation1.phpt gettype_settype_variation2.phpt gettype_settype_variation3.phpt gettype_settype_variation4.phpt gettype_set
tony2001Tue May 22 16:56:47 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions gettype_settype_variation1.phpt gettype_settype_variation2.phpt gettype_settype_variation3.phpt gettype_settype_variation4.phpt gettype_settype_variation5.phpt gettype_settype_variation6.phpt gettype_settype_variation7.phpt gettype_settype_variation8.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt Tue May 22 16:56:47 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variatoins +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt Tue May 22 16:56:47 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variations +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt Tue May 22 16:56:47 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variations +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt Tue May 22 16:56:47 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variations +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation5.phpt:1.2 Tue May 22 16:06:44 2007 +++
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions gettype_settype_basic.phpt
tony2001Tue May 22 16:57:18 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions gettype_settype_basic.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt Tue May 22 16:57:18 2007 @@ -1,5 +1,7 @@ --TEST-- Test gettype() settype() functions : basic functionalities +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); -- 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 gettype_settype_basic.phpt gettype_settype_variation1.phpt gettype_settype_variation2.phpt gettype_settype_variation3.phpt gettype
tony2001Tue May 22 16:58:33 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions gettype_settype_basic.phpt gettype_settype_variation1.phpt gettype_settype_variation2.phpt gettype_settype_variation3.phpt gettype_settype_variation4.phpt gettype_settype_variation5.phpt gettype_settype_variation6.phpt gettype_settype_variation7.phpt gettype_settype_variation8.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.1.2.1 Tue May 22 16:01:58 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt Tue May 22 16:58:33 2007 @@ -1,5 +1,7 @@ --TEST-- Test gettype() settype() functions : basic functionalities +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt:1.1.2.1 Tue May 22 16:01:59 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation1.phpt Tue May 22 16:58:33 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variatoins +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt:1.1.2.1 Tue May 22 16:01:58 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation2.phpt Tue May 22 16:58:33 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variations +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt:1.1.2.1 Tue May 22 16:01:58 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_variation3.phpt Tue May 22 16:58:33 2007 @@ -1,5 +1,11 @@ --TEST-- Test gettype() settype() functions : usage variations +--SKIPIF-- +?php +if (PHP_INT_SIZE != 4) die(skip this test is for 32bit platform only); +? +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.1.2.1 php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.1.2.2 --- php-src/ext/standard/tests/general_functions/gettype_settype_variation4.phpt:1.1.2.1 Tue May
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/sybase_ct/tests test.inc
Hello Timm,
how about taking the configuration from environment if present.
Something like PHP_TEST_SYBASE_CT_* environment variables.
best regards
marcus
Tuesday, May 22, 2007, 1:36:55 PM, you wrote:
thekid Tue May 22 11:36:55 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sybase_ct/teststest.inc
Log:
- Added constant TEMPDB, defaulting to tempdb
# This constant is used by some of the tests and should point
# to a database where the user has create proc|table permissions
http://cvs.php.net/viewvc.cgi/php-src/ext/sybase_ct/tests/test.inc?r1=1.4.6.2r2=1.4.6.3diff_format=u
Index: php-src/ext/sybase_ct/tests/test.inc
diff -u php-src/ext/sybase_ct/tests/test.inc:1.4.6.2
php-src/ext/sybase_ct/tests/test.inc:1.4.6.3
--- php-src/ext/sybase_ct/tests/test.inc:1.4.6.2Sun Mar 11 12:56:44
2007
+++ php-src/ext/sybase_ct/tests/test.incTue May 22 11:36:55 2007
@@ -1,13 +1,14 @@
?php
/* This file is part of PHP test framework for ext/sybase_ct
*
- * $Id: test.inc,v 1.4.6.2 2007/03/11 12:56:44 tony2001 Exp $
+ * $Id: test.inc,v 1.4.6.3 2007/05/22 11:36:55 thekid Exp $
*/
// Change if needed
define('HOST', '');
define('USER', '');
define('PASSWORD', '');
+ define('TEMPDB', 'tempdb');
// {{{ bool sybase_msg_handler(int msgnumber, int severity, int state, int
line, string text)
// Handles server messages
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard/tests/general_functions gettype_settype_basic.phpt
Hello Antony, why not simply put precision=14 into th elist of hardcoded ini settings in run-tests.php ? best regards marcus Tuesday, May 22, 2007, 6:57:18 PM, you wrote: tony2001Tue May 22 16:57:18 2007 UTC Modified files: /php-src/ext/standard/tests/general_functions gettype_settype_basic.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt diff -u php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.2 php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.3 --- php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt:1.2 Tue May 22 16:06:44 2007 +++ php-src/ext/standard/tests/general_functions/gettype_settype_basic.phpt Tue May 22 16:57:18 2007 @@ -1,5 +1,7 @@ --TEST-- Test gettype() settype() functions : basic functionalities +--INI-- +precision=14 --FILE-- ?php /* Prototype: string gettype ( mixed $var ); Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main main.c php_globals.h php_variables.c
stasTue May 22 18:16:38 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/main main.c php_globals.h php_variables.c
Log:
fix for CVE-2007-1285 - crash on deep input variable nesting
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.512.2.63.2.14r2=1.512.2.63.2.15diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.14 php-src/main/main.c:1.512.2.63.2.15
--- php-src/main/main.c:1.512.2.63.2.14 Mon Jan 1 09:46:50 2007
+++ php-src/main/main.c Tue May 22 18:16:37 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.63.2.14 2007/01/01 09:46:50 sebastian Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.15 2007/05/22 18:16:37 stas Exp $ */
/* {{{ includes
*/
@@ -338,6 +338,7 @@
STD_PHP_INI_ENTRY(upload_max_filesize,2M,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,
upload_max_filesize,php_core_globals, core_globals)
STD_PHP_INI_ENTRY(post_max_size, 8M,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,
post_max_size, sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY(upload_tmp_dir, NULL,
PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY(max_input_nesting_level, 500,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLongGEZero,
max_input_nesting_level,php_core_globals, core_globals)
STD_PHP_INI_ENTRY(user_dir, NULL,
PHP_INI_SYSTEM, OnUpdateString, user_dir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(variables_order,NULL,
PHP_INI_ALL,OnUpdateStringUnempty, variables_order,
php_core_globals, core_globals)
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.84.2.6.8.2r2=1.84.2.6.8.3diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.84.2.6.8.2
php-src/main/php_globals.h:1.84.2.6.8.3
--- php-src/main/php_globals.h:1.84.2.6.8.2 Mon Jan 1 09:46:50 2007
+++ php-src/main/php_globals.h Tue May 22 18:16:38 2007
@@ -141,6 +141,7 @@
zend_bool always_populate_raw_post_data;
long serialize_precision;
+ long max_input_nesting_level;
};
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.10r2=1.45.2.13.2.11diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.10
php-src/main/php_variables.c:1.45.2.13.2.11
--- php-src/main/php_variables.c:1.45.2.13.2.10 Fri Apr 13 00:42:48 2007
+++ php-src/main/php_variables.cTue May 22 18:16:38 2007
@@ -16,7 +16,7 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.10 2007/04/13 00:42:48 stas Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.11 2007/05/22 18:16:38 stas Exp $ */
#include stdio.h
#include php.h
@@ -66,6 +66,7 @@
zval *gpc_element, **gpc_element_p;
zend_bool is_array;
HashTable *symtable1=NULL;
+ int nest_level = 0;
assert(var != NULL);
@@ -128,6 +129,10 @@
char *escaped_index = NULL, *index_s;
int new_idx_len = 0;
+ if(++nest_level PG(max_input_nesting_level)) {
+ /* too many levels of nesting */
+ php_error_docref(NULL TSRMLS_CC, E_ERROR,
Input variable nesting level more than allowed %d (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ }
ip++;
index_s = ip;
if (isspace(*ip)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /main main.c php_globals.h php_variables.c
Again, please use the [DOC] tag in your commit message to let the doc team know.
And don't forget to update php.ini-dist/recommended NEWS
Btw; did you really mean to set the default value to 500? (its 64 in 5.2)
-Hannes
On 5/22/07, Stanislav Malyshev [EMAIL PROTECTED] wrote:
stasTue May 22 18:16:38 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/main main.c php_globals.h php_variables.c
Log:
fix for CVE-2007-1285 - crash on deep input variable nesting
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.512.2.63.2.14r2=1.512.2.63.2.15diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.512.2.63.2.14 php-src/main/main.c:1.512.2.63.2.15
--- php-src/main/main.c:1.512.2.63.2.14 Mon Jan 1 09:46:50 2007
+++ php-src/main/main.c Tue May 22 18:16:37 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.512.2.63.2.14 2007/01/01 09:46:50 sebastian Exp $ */
+/* $Id: main.c,v 1.512.2.63.2.15 2007/05/22 18:16:37 stas Exp $ */
/* {{{ includes
*/
@@ -338,6 +338,7 @@
STD_PHP_INI_ENTRY(upload_max_filesize,2M,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,upload_max_filesize,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(post_max_size, 8M,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateInt,post_max_size,
sapi_globals_struct,sapi_globals)
STD_PHP_INI_ENTRY(upload_tmp_dir, NULL,
PHP_INI_SYSTEM, OnUpdateStringUnempty, upload_tmp_dir,
php_core_globals, core_globals)
+ STD_PHP_INI_ENTRY(max_input_nesting_level, 500,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateLongGEZero, max_input_nesting_level,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(user_dir, NULL,
PHP_INI_SYSTEM, OnUpdateString, user_dir,
php_core_globals, core_globals)
STD_PHP_INI_ENTRY(variables_order,NULL,
PHP_INI_ALL,OnUpdateStringUnempty, variables_order,
php_core_globals, core_globals)
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.84.2.6.8.2r2=1.84.2.6.8.3diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.84.2.6.8.2
php-src/main/php_globals.h:1.84.2.6.8.3
--- php-src/main/php_globals.h:1.84.2.6.8.2 Mon Jan 1 09:46:50 2007
+++ php-src/main/php_globals.h Tue May 22 18:16:38 2007
@@ -141,6 +141,7 @@
zend_bool always_populate_raw_post_data;
long serialize_precision;
+ long max_input_nesting_level;
};
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.10r2=1.45.2.13.2.11diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.10
php-src/main/php_variables.c:1.45.2.13.2.11
--- php-src/main/php_variables.c:1.45.2.13.2.10 Fri Apr 13 00:42:48 2007
+++ php-src/main/php_variables.cTue May 22 18:16:38 2007
@@ -16,7 +16,7 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.10 2007/04/13 00:42:48 stas Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.11 2007/05/22 18:16:38 stas Exp $ */
#include stdio.h
#include php.h
@@ -66,6 +66,7 @@
zval *gpc_element, **gpc_element_p;
zend_bool is_array;
HashTable *symtable1=NULL;
+ int nest_level = 0;
assert(var != NULL);
@@ -128,6 +129,10 @@
char *escaped_index = NULL, *index_s;
int new_idx_len = 0;
+ if(++nest_level PG(max_input_nesting_level)) {
+ /* too many levels of nesting */
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, Input
variable nesting level more than allowed %d (change max_input_nesting_level in php.ini to
increase the limit), PG(max_input_nesting_level));
+ }
ip++;
index_s = ip;
if (isspace(*ip)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
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) / NEWS
bjori Tue May 22 19:31:08 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: new curl constants http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.730r2=1.2027.2.547.2.731diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.730 php-src/NEWS:1.2027.2.547.2.731 --- php-src/NEWS:1.2027.2.547.2.730 Tue May 22 16:38:50 2007 +++ php-src/NEWSTue May 22 19:31:07 2007 @@ -9,6 +9,7 @@ makes the function not encode existing html entities. (Ilia) - Added PDO::FETCH_KEY_PAIR mode that will fetch a 2 column result set into an associated array. (Ilia) +- Added CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS cURL constants. (Sara) - Added --ini switch to CLI that prints out configuration file names. (Marcus) - Added function mysql_set_charset(). Allows connection encoding to be altered at run time. (Scott) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
