[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Mar 12 06:31:44 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2281r2=1.2282diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2281 php-src/ChangeLog:1.2282 --- php-src/ChangeLog:1.2281Sat Mar 11 06:31:42 2006 +++ php-src/ChangeLog Sun Mar 12 06:31:43 2006 @@ -1,3 +1,36 @@ +2006-03-11 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + run-tests.php: + - MFH Fix writing faillog with redirected tests + +* run-tests.php: + - Fix writing faillog with redirected tests + +* (PHP_5_1) + run-tests.php: + - MFH Fix test results with redirected tests + +* run-tests.php: + - Fix test results with redirected tests + +* run-tests.php: + - Load list of extensions to test from php that is being tested rather than +from php running the tests + - When executing both unicode and native modes then show the type of test +in the reult list (PASS:U, PASS:N, etc) + +* (PHP_5_1) + run-tests.php: + - Load list of extensions to test from php that is being tested rather than +from php running the tests + +2006-03-11 Georg Richter [EMAIL PROTECTED] + +* (PHP_5_1) + ext/mysqli/mysqli_api.c: + fix for MySQL 5.1 (see http://bugs.mysql.com/?id=16144) + 2006-03-10 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_1)
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c
georg Sat Mar 11 11:16:03 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c
Log:
fix for MySQL 5.1 (see http://bugs.mysql.com/?id=16144)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.16r2=1.118.2.17diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.16
php-src/ext/mysqli/mysqli_api.c:1.118.2.17
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.16 Sun Jan 1 16:55:01 2006
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 11 11:16:03 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.16 2006/01/01 16:55:01 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.17 2006/03/11 11:16:03 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,12 @@
case MYSQL_TYPE_NEWDECIMAL:
#endif
{
+#if VERSION_ID 50999
+ /* Changed to my_bool in MySQL 5.1. See MySQL
Bug #16144 */
+ my_bool tmp;
+#else
ulong tmp;
+#endif
stmt-result.buf[ofs].type = IS_STRING;
/*
If the user has called
$stmt-store_result() then we have asked
@@ -1822,7 +1827,7 @@
{
MY_STMT *stmt;
zval*mysql_stmt;
- ulong value;
+ ulong value = 0;
ulong attr;
int rc;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / run-tests.php
helly Sat Mar 11 16:37:53 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcrun-tests.php
Log:
- Load list of extensions to test from php that is being tested rather than
from php running the tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.32r2=1.226.2.33diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.32 php-src/run-tests.php:1.226.2.33
--- php-src/run-tests.php:1.226.2.32Thu Feb 16 06:29:40 2006
+++ php-src/run-tests.php Sat Mar 11 16:37:53 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.32 2006/02/16 06:29:40 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.33 2006/03/11 16:37:53 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -142,6 +142,7 @@
$user_tests = array();
}
+$exts_to_test = array();
$ini_overwrites = array(
'output_handler=',
'open_basedir=',
@@ -166,7 +167,7 @@
function write_information($show_html)
{
- global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options;
+ global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test;
// Get info from php
$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
@@ -186,17 +187,17 @@
@unlink($info_file);
define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
+ // load list of enabled extensions
+ save_text($info_file, '?php echo join(,,get_loaded_extensions());
?');
+ $exts_to_test = explode(',',`$php $pass_options $info_params
$info_file`);
// check for extensions that need special handling and regenerate
- $php_extensions = '?php echo join(,,get_loaded_extensions()); ?';
- save_text($info_file, $php_extensions);
- $php_extensions = explode(',',`$php $pass_options $info_params
$info_file`);
$info_params_ex = array(
'session' = array('session.auto_start=0'),
'zlib' = array('zlib.output_compression=Off'),
'xdebug' = array('xdebug.default_enable=0'),
);
foreach($info_params_ex as $ext = $ini_overwrites_ex) {
- if (in_array($ext, $php_extensions)) {
+ if (in_array($ext, $exts_to_test)) {
$ini_overwrites = array_merge($ini_overwrites,
$ini_overwrites_ex);
}
}
@@ -387,7 +388,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.32 $'.\n;
+ echo '$Revision: 1.226.2.33 $'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -518,13 +519,12 @@
// Compile a list of all test files (*.phpt).
$test_files = array();
-$exts_to_test = get_loaded_extensions();
$exts_tested = count($exts_to_test);
$exts_skipped = 0;
$ignored_by_ext = 0;
sort($exts_to_test);
-$test_dirs = array('tests', 'ext');
-$optionals = array('Zend', 'ZendEngine2');
+$test_dirs = array();
+$optionals = array('tests', 'ext', 'Zend', 'ZendEngine2');
foreach($optionals as $dir) {
if (@filetype($dir) == 'dir') {
$test_dirs[] = $dir;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Sat Mar 11 16:54:11 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Load list of extensions to test from php that is being tested rather than
from php running the tests
- When executing both unicode and native modes then show the type of test
in the reult list (PASS:U, PASS:N, etc)
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.281r2=1.282diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.281 php-src/run-tests.php:1.282
--- php-src/run-tests.php:1.281 Wed Mar 8 14:41:45 2006
+++ php-src/run-tests.php Sat Mar 11 16:54:11 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.281 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: run-tests.php,v 1.282 2006/03/11 16:54:11 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -127,6 +127,7 @@
$user_tests = array();
}
+$exts_to_test = array();
$ini_overwrites = array(
'output_handler=',
'open_basedir=',
@@ -150,7 +151,7 @@
function write_information($show_html)
{
- global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options;
+ global $cwd, $php, $php_info, $user_tests, $ini_overwrites,
$pass_options, $exts_to_test;
// Get info from php
$info_file = realpath(dirname(__FILE__)) . '/run-test-info.php';
@@ -174,17 +175,17 @@
$unicode = `$php $pass_options $info_params -r 'echo
ini_get(unicode_semantics);'`;
define('TESTED_UNICODE', strcasecmp($unicode,on) == 0 || $unicode ==
1);
+ // load list of enabled extensions
+ save_text($info_file, '?php echo join(,,get_loaded_extensions());
?');
+ $exts_to_test = explode(',',`$php $pass_options $info_params
$info_file`);
// check for extensions that need special handling and regenerate
- $php_extensions = '?php echo join(,,get_loaded_extensions()); ?';
- save_text($info_file, $php_extensions);
- $php_extensions = explode(',',`$php $pass_options $info_params
$info_file`);
$info_params_ex = array(
'session' = array('session.auto_start=0'),
'zlib' = array('zlib.output_compression=Off'),
'xdebug' = array('xdebug.default_enable=0'),
);
foreach($info_params_ex as $ext = $ini_overwrites_ex) {
- if (in_array($ext, $php_extensions)) {
+ if (in_array($ext, $exts_to_test)) {
$ini_overwrites = array_merge($ini_overwrites,
$ini_overwrites_ex);
}
}
@@ -389,7 +390,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.281 $'.\n;
+ echo '$Revision: 1.282 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -521,13 +522,12 @@
// Compile a list of all test files (*.phpt).
$test_files = array();
-$exts_to_test = get_loaded_extensions();
$exts_tested = count($exts_to_test);
$exts_skipped = 0;
$ignored_by_ext = 0;
sort($exts_to_test);
-$test_dirs = array('tests', 'ext');
-$optionals = array('Zend', 'ZendEngine2');
+$test_dirs = array();
+$optionals = array('tests', 'ext', 'Zend', 'ZendEngine2');
foreach($optionals as $dir) {
if (@filetype($dir) == 'dir') {
$test_dirs[] = $dir;
@@ -1016,7 +1016,7 @@
$tested_file = $shortname;
if ($borked) {
- show_result(BORK, $bork_info, $tested_file);
+ show_result(BORK, $bork_info, $tested_file,
$unicode_semantics);
$PHP_FAILED_TESTS['BORKED'][] = array (
'name' = $file,
'test_name' =
'',
@@ -1038,7 +1038,7 @@
$old_php = $php;
$php = realpath(./sapi/cgi/php) . ' -C ';
} else {
- show_result(SKIP, $tested, $tested_file, reason: CGI
not available);
+ show_result(SKIP, $tested, $tested_file,
$unicode_semantics, reason: CGI not available);
return 'SKIPPED';
}
}
@@ -1176,9 +1176,9 @@
if (!strncasecmp('skip', trim($output), 4)) {
$reason = (eregi(^skip[[:space:]]*(.+)\$,
trim($output))) ? eregi_replace(^skip[[:space:]]*(.+)\$, \\1,
trim($output)) : FALSE;
if ($reason) {
-
[PHP-CVS] cvs: php-src / run-tests.php
helly Sat Mar 11 17:57:40 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Fix test results with redirected tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.282r2=1.283diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.282 php-src/run-tests.php:1.283
--- php-src/run-tests.php:1.282 Sat Mar 11 16:54:11 2006
+++ php-src/run-tests.php Sat Mar 11 17:57:40 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.282 2006/03/11 16:54:11 helly Exp $ */
+/* $Id: run-tests.php,v 1.283 2006/03/11 17:57:40 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -390,7 +390,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.282 $'.\n;
+ echo '$Revision: 1.283 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -883,9 +883,13 @@
{
$test_cnt *= 2;
}
- foreach($test_files AS $name)
+ foreach($test_files as $name)
{
- $index = is_array($name) ? $name[0] : $name;
+ if ($redir_tested) {
+ $index = # $redir_tested: $name;
+ } else {
+ $index = is_array($name) ? # $name[1]: $name[0] :
$name;
+ }
$unicode_semantics = $unicode_and_native ? 0 :
($unicode_testing ? 1 : 0);
for(; $unicode_semantics ($unicode_testing ? 2 : 1);
$unicode_semantics++)
{
@@ -897,12 +901,7 @@
$test_results[$index.$pu] = $result;
if ($failed_tests_file ($result == 'FAILED'
|| $result == 'WARNED' || $result == 'LEAKED'))
{
- if ($redir_tested)
- {
- fwrite($failed_tests_file, #
$redir_tested: $name\n);
- } else {
- fwrite($failed_tests_file,
$name\n);
- }
+ fwrite($failed_tests_file, $index\n);
}
}
if ($result == 'REDIR')
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / run-tests.php
helly Sat Mar 11 17:58:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcrun-tests.php
Log:
- MFH Fix test results with redirected tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.33r2=1.226.2.34diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.33 php-src/run-tests.php:1.226.2.34
--- php-src/run-tests.php:1.226.2.33Sat Mar 11 16:37:53 2006
+++ php-src/run-tests.php Sat Mar 11 17:58:24 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.33 2006/03/11 16:37:53 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.34 2006/03/11 17:58:24 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -388,7 +388,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.33 $'.\n;
+ echo '$Revision: 1.226.2.34 $'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -876,9 +876,13 @@
{
global $test_results, $failed_tests_file, $php, $test_cnt, $test_idx;
- foreach($test_files AS $name)
+ foreach($test_files as $name)
{
- $index = is_array($name) ? $name[0] : $name;
+ if ($redir_tested) {
+ $index = # $redir_tested: $name;
+ } else {
+ $index = is_array($name) ? # $name[1]: $name[0] :
$name;
+ }
$test_idx++;
$result = run_test($php, $name, $env);
if (!is_array($name) $result != 'REDIR')
@@ -886,12 +890,7 @@
$test_results[$index] = $result;
if ($failed_tests_file ($result == 'FAILED' ||
$result == 'WARNED' || $result == 'LEAKED'))
{
- if ($redir_tested)
- {
- fwrite($failed_tests_file, #
$redir_tested: $name\n);
- } else {
- fwrite($failed_tests_file, $name\n);
- }
+ fwrite($failed_tests_file, $index\n);
}
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Sat Mar 11 18:13:13 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
- Fix writing faillog with redirected tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.283r2=1.284diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.283 php-src/run-tests.php:1.284
--- php-src/run-tests.php:1.283 Sat Mar 11 17:57:40 2006
+++ php-src/run-tests.php Sat Mar 11 18:13:13 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.283 2006/03/11 17:57:40 helly Exp $ */
+/* $Id: run-tests.php,v 1.284 2006/03/11 18:13:13 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -390,7 +390,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.283 $'.\n;
+ echo '$Revision: 1.284 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -885,10 +885,21 @@
}
foreach($test_files as $name)
{
- if ($redir_tested) {
+ if (is_array($name))
+ {
+ $index = # $name[1]: $name[0];
+ if ($redir_tested)
+ {
+ $name = $name[0];
+ }
+ }
+ else if ($redir_tested)
+ {
$index = # $redir_tested: $name;
- } else {
- $index = is_array($name) ? # $name[1]: $name[0] :
$name;
+ }
+ else
+ {
+ $index = $name;
}
$unicode_semantics = $unicode_and_native ? 0 :
($unicode_testing ? 1 : 0);
for(; $unicode_semantics ($unicode_testing ? 2 : 1);
$unicode_semantics++)
@@ -1217,7 +1228,9 @@
} else {
$GLOBALS['test_files'] = $test_files;
find_files($IN_REDIRECT['TESTS']);
- $test_files = $GLOBALS['test_files'];
+ foreach($GLOBALS['test_files'] as $f) {
+ $test_files[] = array($f, $file);
+ }
}
$test_cnt += (count($test_files) - 1) *
($unicode_and_native ? 2 : 1);
$test_idx--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / run-tests.php
helly Sat Mar 11 18:13:37 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcrun-tests.php
Log:
- MFH Fix writing faillog with redirected tests
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.34r2=1.226.2.35diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.34 php-src/run-tests.php:1.226.2.35
--- php-src/run-tests.php:1.226.2.34Sat Mar 11 17:58:24 2006
+++ php-src/run-tests.php Sat Mar 11 18:13:37 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.34 2006/03/11 17:58:24 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.35 2006/03/11 18:13:37 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -388,7 +388,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.34 $'.\n;
+ echo '$Revision: 1.226.2.35 $'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -878,10 +878,21 @@
foreach($test_files as $name)
{
- if ($redir_tested) {
+ if (is_array($name))
+ {
+ $index = # $name[1]: $name[0];
+ if ($redir_tested)
+ {
+ $name = $name[0];
+ }
+ }
+ else if ($redir_tested)
+ {
$index = # $redir_tested: $name;
- } else {
- $index = is_array($name) ? # $name[1]: $name[0] :
$name;
+ }
+ else
+ {
+ $index = $name;
}
$test_idx++;
$result = run_test($php, $name, $env);
@@ -1186,7 +1197,9 @@
} else {
$GLOBALS['test_files'] = $test_files;
find_files($IN_REDIRECT['TESTS']);
- $test_files = $GLOBALS['test_files'];
+ foreach($GLOBALS['test_files'] as $f) {
+ $test_files[] = array($f, $file);
+ }
}
$test_cnt += count($test_files) - 1;
$test_idx--;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
rasmus Sun Mar 12 04:10:06 2006 UTC Modified files: /CVSROOTavail Log: Karma for Gopal http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1105r2=1.1106diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1105 CVSROOT/avail:1.1106 --- CVSROOT/avail:1.1105Tue Mar 7 19:26:04 2006 +++ CVSROOT/avail Sun Mar 12 04:10:05 2006 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP and PEAR, as well as the documentation. -avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,phpdoc,php! doc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca +avail|mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,sniper,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,gopalv|phpfi,php3,php-src,pecl,non-pecl,pear,peardoc,spl,php! doc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
hirokawaSun Mar 12 07:54:03 2006 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
fixed a possible null injection caused by missuse of
mbstring.substitute_character.
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.242r2=1.243diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.242
php-src/ext/mbstring/mbstring.c:1.243
--- php-src/ext/mbstring/mbstring.c:1.242 Fri Mar 10 16:36:52 2006
+++ php-src/ext/mbstring/mbstring.c Sun Mar 12 07:54:03 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.242 2006/03/10 16:36:52 masugata Exp $ */
+/* $Id: mbstring.c,v 1.243 2006/03/12 07:54:03 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -688,6 +688,9 @@
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
{
+ int c;
+ char *endptr = NULL;
+
if (new_value != NULL) {
if (strcasecmp(none, new_value) == 0) {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
@@ -695,7 +698,12 @@
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG;
} else {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- MBSTRG(filter_illegal_substchar) = zend_atoi(new_value,
new_value_length);
+ if (new_value_length 0) {
+ c = strtol(new_value, endptr, 0);
+ if (*endptr == '\0') {
+ MBSTRG(filter_illegal_substchar) = c;
+ }
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/mysqli mysqli_api.c
Please don't forget about MFB.
On 11.03.2006 13:16, Georg Richter wrote:
georg Sat Mar 11 11:16:03 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_api.c
Log:
fix for MySQL 5.1 (see http://bugs.mysql.com/?id=16144)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.118.2.16r2=1.118.2.17diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.118.2.16
php-src/ext/mysqli/mysqli_api.c:1.118.2.17
--- php-src/ext/mysqli/mysqli_api.c:1.118.2.16 Sun Jan 1 16:55:01 2006
+++ php-src/ext/mysqli/mysqli_api.c Sat Mar 11 11:16:03 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.118.2.16 2006/01/01 16:55:01 andrey Exp $
+ $Id: mysqli_api.c,v 1.118.2.17 2006/03/11 11:16:03 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,12 @@
case MYSQL_TYPE_NEWDECIMAL:
#endif
{
+#if VERSION_ID 50999
+ /* Changed to my_bool in MySQL 5.1. See MySQL
Bug #16144 */
+ my_bool tmp;
+#else
ulong tmp;
+#endif
stmt-result.buf[ofs].type = IS_STRING;
/*
If the user has called
$stmt-store_result() then we have asked
@@ -1822,7 +1827,7 @@
{
MY_STMT *stmt;
zval*mysql_stmt;
- ulong value;
+ ulong value = 0;
ulong attr;
int rc;
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/mbstring mbstring.c
hirokawaSun Mar 12 07:54:43 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mbstring mbstring.c
Log:
MFH
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.16r2=1.224.2.17diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.16
php-src/ext/mbstring/mbstring.c:1.224.2.17
--- php-src/ext/mbstring/mbstring.c:1.224.2.16 Fri Mar 10 16:22:15 2006
+++ php-src/ext/mbstring/mbstring.c Sun Mar 12 07:54:42 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.16 2006/03/10 16:22:15 masugata Exp $ */
+/* $Id: mbstring.c,v 1.224.2.17 2006/03/12 07:54:42 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -687,6 +687,9 @@
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
{
+ int c;
+ char *endptr = NULL;
+
if (new_value != NULL) {
if (strcasecmp(none, new_value) == 0) {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
@@ -694,7 +697,12 @@
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG;
} else {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- MBSTRG(filter_illegal_substchar) = zend_atoi(new_value,
new_value_length);
+ if (new_value_length 0) {
+ c = strtol(new_value, endptr, 0);
+ if (*endptr == '\0') {
+ MBSTRG(filter_illegal_substchar) = c;
+ }
+ }
}
}
--
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) /ext/mbstring mbstring.c
hirokawaSun Mar 12 07:54:56 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
MFH
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.11r2=1.142.2.47.2.12diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.11
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.12
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.11 Fri Mar 10 16:15:35 2006
+++ php-src/ext/mbstring/mbstring.c Sun Mar 12 07:54:56 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.11 2006/03/10 16:15:35 masugata Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.12 2006/03/12 07:54:56 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -757,6 +757,9 @@
/* {{{ static PHP_INI_MH(OnUpdate_mbstring_substitute_character) */
static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
{
+ int c;
+ char *endptr = NULL;
+
if (new_value != NULL) {
if (strcasecmp(none, new_value) == 0) {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_NONE;
@@ -764,7 +767,12 @@
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_LONG;
} else {
MBSTRG(filter_illegal_mode) =
MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
- MBSTRG(filter_illegal_substchar) = zend_atoi(new_value,
new_value_length);
+ if (new_value_length 0) {
+ c = strtol(new_value, endptr, 0);
+ if (*endptr == '\0') {
+ MBSTRG(filter_illegal_substchar) = c;
+ }
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
