[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Feb 21 01:32:36 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3324r2=1.3325diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3324 php-src/ChangeLog:1.3325 --- php-src/ChangeLog:1.3324Fri Feb 20 01:32:40 2009 +++ php-src/ChangeLog Sat Feb 21 01:32:35 2009 @@ -1,3 +1,43 @@ +2009-02-20 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + ZendEngine2/tests/bug46701.phpt + ext/pdo_sqlite/tests/bug46542.phpt + ext/pdo_sqlite/tests/bug46542.phpt: + - Fix test + +2009-02-20 Andrey Hristov p...@hristov.com + +* (PHP_5_3) + ext/mysqlnd/mysqlnd_charset.c: + MFH: Add charsets from MySQL 6.0 as a structure to be used later + +* ext/mysqlnd/mysqlnd_charset.c: + Add the charsets available from 6.0 as a structure, to be used later + +2009-02-20 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_2) + ZendEngine2/tests/bug45805.phpt: + - spl is not forced on everyone in 5.2 branch. + +2009-02-20 Greg Beaver g...@chiaraquartet.net + +* ext/phar/phar.c + ext/phar/pharzip.h + ext/phar/zip.c: + MFB: fix zip access to work in all compilers, present and future, and on + all arches without potential for bus errors. This removes PHAR_ZIP_PACK + in favor of a safer approach + +* (PHP_5_3) + ext/phar/phar.c + ext/phar/pharzip.h + ext/phar/zip.c: + fix zip access to work in all compilers, present and future, and on all + arches without potential for bus errors. This removes PHAR_ZIP_PACK in + favor of a safer approach + 2009-02-19 Ilia Alshanetsky i...@prohost.org * (PHP_5_2) @@ -30653,7 +30693,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3324 2009/02/20 01:32:40 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3325 2009/02/21 01:32:35 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Feb 21 01:32:41 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1448r2=1.1449diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1448 ZendEngine2/ChangeLog:1.1449 --- ZendEngine2/ChangeLog:1.1448Thu Feb 19 01:32:43 2009 +++ ZendEngine2/ChangeLog Sat Feb 21 01:32:40 2009 @@ -1,3 +1,15 @@ +2009-02-20 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + tests/bug46701.phpt: + - Fix test + +2009-02-20 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_2) + tests/bug45805.phpt: + - spl is not forced on everyone in 5.2 branch. + 2009-02-18 Dmitry Stogov dmi...@zend.com * zend_gc.c @@ -27888,7 +27900,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1448 2009/02/19 01:32:43 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1449 2009/02/21 01:32:40 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -29612,7 +29624,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1448 2009/02/19 01:32:43 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1449 2009/02/21 01:32:40 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_charset.c
andrey Fri Feb 20 13:25:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_charset.c
Log:
MFH: Add charsets from MySQL 6.0 as a structure to be used later
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_charset.c?r1=1.2.2.9r2=1.2.2.10diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_charset.c
diff -u php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.9
php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.10
--- php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.9 Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_charset.c Fri Feb 20 13:25:12 2009
@@ -429,6 +429,165 @@
/* }}} */
+/* {{{ mysqlnd_charsets */
+const MYSQLND_CHARSET mysqlnd_charsets60[] =
+{
+ { 1, big5,big5_chinese_ci, 1, 2, , mysqlnd_mbcharlen_big5,
check_mb_big5},
+ { 3, dec8, dec8_swedisch_ci, 1, 1, , NULL, NULL},
+ { 4, cp850, cp850_general_ci, 1, 1, , NULL, NULL},
+ { 6, hp8, hp8_english_ci, 1, 1, , NULL, NULL},
+ { 7, koi8r, koi8r_general_ci, 1, 1, , NULL, NULL},
+ { 8, latin1, latin1_swedish_ci, 1, 1, , NULL, NULL},
+ { 9, latin2, latin2_general_ci, 1, 1, , NULL, NULL},
+ { 10, swe7, swe7_swedish_ci, 1, 1, , NULL, NULL},
+ { 11, ascii, ascii_general_ci, 1, 1, , NULL, NULL},
+ { 12, ujis, ujis_japanese_ci, 1, 3, , mysqlnd_mbcharlen_ujis,
check_mb_ujis},
+ { 13, sjis, sjis_japanese_ci, 1, 2, , mysqlnd_mbcharlen_sjis,
check_mb_sjis},
+ { 16, hebrew, hebrew_general_ci, 1, 1, , NULL, NULL},
+ { 18, tis620, tis620_thai_ci, 1, 1, , NULL, NULL},
+ { 19, euckr, euckr_korean_ci, 1, 2, , mysqlnd_mbcharlen_euckr,
check_mb_euckr},
+ { 22, koi8u, koi8u_general_ci, 1, 1, , NULL, NULL},
+ { 24, gb2312, gb2312_chinese_ci, 1, 2, ,
mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
+ { 25, greek, greek_general_ci, 1, 1, , NULL, NULL},
+ { 26, cp1250, cp1250_general_ci, 1, 1, , NULL, NULL},
+ { 28, gbk, gbk_chinese_ci, 1, 2, , mysqlnd_mbcharlen_gbk,
check_mb_gbk},
+ { 30, latin5, latin5_turkish_ci, 1, 1, , NULL, NULL},
+ { 32, armscii8, armscii8_general_ci, 1, 1, , NULL, NULL},
+ { 33, utf8, utf8_general_ci, 1, 2, UTF-8 Unicode,
mysqlnd_mbcharlen_utf8, check_mb_utf8_valid},
+ { 35, ucs2, ucs2_general_ci, 2, 2, UCS-2 Unicode,
mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+ { 36, cp866, cp866_general_ci, 1, 1, , NULL, NULL},
+ { 37, keybcs2, keybcs2_general_ci, 1, 1, , NULL, NULL},
+ { 38, macce, macce_general_ci, 1, 1, , NULL, NULL},
+ { 39, macroman, macroman_general_ci, 1, 1, , NULL, NULL},
+ { 40, cp852, cp852_general_ci, 1, 1, , NULL, NULL},
+ { 41, latin7, latin7_general_ci, 1, 1, , NULL, NULL},
+ { 51, cp1251, cp1251_general_ci, 1, 1, , NULL, NULL},
+ { 57, cp1256, cp1256_general_ci, 1, 1, , NULL, NULL},
+ { 59, cp1257, cp1257_general_ci, 1, 1, , NULL, NULL},
+ { 63, binary, binary, 1, 1, , NULL, NULL},
+ { 92, geostd8, geostd8_general_ci, 1, 1, , NULL, NULL},
+ { 95, cp932, cp932_japanese_ci, 1, 2, , mysqlnd_mbcharlen_cp932,
check_mb_cp932},
+ { 97, eucjpms, eucjpms_japanese_ci, 1, 3, ,
mysqlnd_mbcharlen_eucjpms, check_mb_eucjpms},
+ { 2, latin2, latin2_czech_cs, 1, 1, , NULL, NULL},
+ { 5, latin1, latin1_german_ci, 1, 1, , NULL, NULL},
+ { 14, cp1251, cp1251_bulgarian_ci, 1, 1, , NULL, NULL},
+ { 15, latin1, latin1_danish_ci, 1, 1, , NULL, NULL},
+ { 17, filename, filename, 1, 5, , NULL, NULL},
+ { 20, latin7, latin7_estonian_cs, 1, 1, , NULL, NULL},
+ { 21, latin2, latin2_hungarian_ci, 1, 1, , NULL, NULL},
+ { 23, cp1251, cp1251_ukrainian_ci, 1, 1, , NULL, NULL},
+ { 27, latin2, latin2_croatian_ci, 1, 1, , NULL, NULL},
+ { 29, cp1257, cp1257_lithunian_ci, 1, 1, , NULL, NULL},
+ { 31, latin1, latin1_german2_ci, 1, 1, , NULL, NULL},
+ { 34, cp1250, cp1250_czech_cs, 1, 1, , NULL, NULL},
+ { 42, latin7, latin7_general_cs, 1, 1, , NULL, NULL},
+ { 43, macce, macce_bin, 1, 1, , NULL, NULL},
+ { 44, cp1250, cp1250_croatian_ci, 1, 1, , NULL, NULL},
+ { 47, latin1, latin1_bin, 1, 1, , NULL, NULL},
+ { 48, latin1, latin1_general_ci, 1, 1, , NULL, NULL},
+ { 49, latin1, latin1_general_cs, 1, 1, , NULL, NULL},
+ { 50, cp1251, cp1251_bin, 1, 1, , NULL, NULL},
+ { 52, cp1251, cp1251_general_cs, 1, 1, , NULL, NULL},
+ { 53, macroman, macroman_bin, 1, 1, , NULL, NULL},
+ { 58, cp1257, cp1257_bin, 1, 1, , NULL, NULL},
+ { 60, armascii8, armascii8_bin, 1, 1, , NULL, NULL},
+ { 65, ascii, ascii_bin, 1, 1, , NULL, NULL},
+ { 66, cp1250, cp1250_bin, 1, 1, , NULL, NULL},
+ { 67, cp1256, cp1256_bin, 1, 1, , NULL, NULL},
+ { 68, cp866, cp866_bin, 1, 1, , NULL, NULL},
+ { 69, dec8, dec8_bin, 1, 1, , NULL, NULL},
+ { 70, greek,
[PHP-CVS] cvs: php-src /ext/pdo_sqlite/tests bug46542.phpt
felipe Fri Feb 20 13:37:48 2009 UTC Modified files: /php-src/ext/pdo_sqlite/tests bug46542.phpt Log: - Fix test http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/tests/bug46542.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/pdo_sqlite/tests/bug46542.phpt diff -u php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1 php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.2 --- php-src/ext/pdo_sqlite/tests/bug46542.phpt:1.1 Tue Feb 17 14:39:58 2009 +++ php-src/ext/pdo_sqlite/tests/bug46542.phpt Fri Feb 20 13:37:48 2009 @@ -17,4 +17,4 @@ ? --EXPECT-- A::truc -A::truc +A::TRUC -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar zip.c
cellog Sat Feb 21 02:32:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar zip.c
Log:
cosmetics: fix warning (only affects suncc)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.47.2.29r2=1.47.2.30diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.47.2.29 php-src/ext/phar/zip.c:1.47.2.30
--- php-src/ext/phar/zip.c:1.47.2.29Fri Feb 20 05:06:37 2009
+++ php-src/ext/phar/zip.c Sat Feb 21 02:32:16 2009
@@ -727,7 +727,7 @@
PHAR_SET_16(perms.size, sizeof(perms) - 4);
PHAR_SET_16(perms.perms, entry-flags PHAR_ENT_PERM_MASK);
{
- php_uint32 crc = ~0;
+ php_uint32 crc = (php_uint32) ~0;
CRC32(crc, perms.perms[0]);
CRC32(crc, perms.perms[1]);
PHAR_SET_32(perms.crc32, ~crc);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar zip.c
cellog Sat Feb 21 02:34:02 2009 UTC
Modified files:
/php-src/ext/phar zip.c
Log:
MFB: cosmetics: fix warning (only affects suncc)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/zip.c?r1=1.64r2=1.65diff_format=u
Index: php-src/ext/phar/zip.c
diff -u php-src/ext/phar/zip.c:1.64 php-src/ext/phar/zip.c:1.65
--- php-src/ext/phar/zip.c:1.64 Fri Feb 20 05:06:52 2009
+++ php-src/ext/phar/zip.c Sat Feb 21 02:34:01 2009
@@ -728,7 +728,7 @@
PHAR_SET_16(perms.size, sizeof(perms) - 4);
PHAR_SET_16(perms.perms, entry-flags PHAR_ENT_PERM_MASK);
{
- php_uint32 crc = ~0;
+ php_uint32 crc = (php_uint32) ~0;
CRC32(crc, perms.perms[0]);
CRC32(crc, perms.perms[1]);
PHAR_SET_32(perms.crc32, ~crc);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/cache_list/files write5.phar write5.phar.inc write6.phar write6.phar.inc
cellog Sat Feb 21 03:15:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/cache_list/fileswrite5.phar
write5.phar.inc
write6.phar
write6.phar.inc
Log:
fix faulty logic in tests, needed to use ksort instead of asort and to sort
output. These tests failed on some systems with non-case sensitive filesystem
sorting
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write5.phar?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write5.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write5.phar.inc?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write5.phar.inc
diff -u php-src/ext/phar/tests/cache_list/files/write5.phar.inc:1.1.2.1
php-src/ext/phar/tests/cache_list/files/write5.phar.inc:1.1.2.2
--- php-src/ext/phar/tests/cache_list/files/write5.phar.inc:1.1.2.1 Mon Oct
13 04:21:09 2008
+++ php-src/ext/phar/tests/cache_list/files/write5.phar.inc Sat Feb 21
03:15:46 2009
@@ -10,13 +10,15 @@
mkdir($d);
file_put_contents($d . /file1, file1\n);
file_put_contents($d . /file2, file2\n);
-var_dump($phar-buildFromDirectory($d));
+$arr = $phar-buildFromDirectory($d);
+ksort($arr);
+var_dump($arr);
$phar2 = new Phar(__FILE__);
$arr = array();
foreach ($phar2 as $name = $file) {
$arr[$name] = $file-getContent();
}
-asort($arr);
+ksort($arr);
foreach ($arr as $name = $content) {
echo $name, , $content;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/cache_list/files/write6.phar.inc?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/phar/tests/cache_list/files/write6.phar.inc
diff -u php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.2
php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.3
--- php-src/ext/phar/tests/cache_list/files/write6.phar.inc:1.1.2.2 Sun Feb
15 21:43:39 2009
+++ php-src/ext/phar/tests/cache_list/files/write6.phar.inc Sat Feb 21
03:15:47 2009
@@ -10,13 +10,16 @@
mkdir($d);
file_put_contents($d . /file1, file1\n);
file_put_contents($d . /file2, file2\n);
-var_dump($phar-buildFromIterator(new RecursiveDirectoryIterator($d,
RecursiveDirectoryIterator::SKIP_DOTS),$d));
+$arr = $phar-buildFromIterator(new RecursiveDirectoryIterator($d,
RecursiveDirectoryIterator::SKIP_DOTS),$d);
+$arr = $phar-buildFromDirectory($d);
+ksort($arr);
+var_dump($arr);
$phar2 = new Phar(__FILE__);
$arr = array();
foreach ($phar2 as $name = $file) {
$arr[$name] = $file-getContent();
}
-asort($arr);
+ksort($arr);
foreach ($arr as $name = $content) {
echo $name, , $content;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_object.c
cellog Sat Feb 21 02:37:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar_object.c Log: cosmetics: remove two unreachable return statements, removes warning in sun cc http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.57r2=1.266.2.58diff_format=u Index: php-src/ext/phar/phar_object.c diff -u php-src/ext/phar/phar_object.c:1.266.2.57 php-src/ext/phar/phar_object.c:1.266.2.58 --- php-src/ext/phar/phar_object.c:1.266.2.57 Wed Dec 31 11:15:42 2008 +++ php-src/ext/phar/phar_object.c Sat Feb 21 02:37:18 2009 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar_object.c,v 1.266.2.57 2008/12/31 11:15:42 sebastian Exp $ */ +/* $Id: phar_object.c,v 1.266.2.58 2009/02/21 02:37:18 cellog Exp $ */ #include phar_internal.h #include func_interceptors.h @@ -3946,7 +3946,6 @@ phar_parse_metadata(buf, ret, phar_obj-arc.archive-metadata_len TSRMLS_CC); efree(buf); RETURN_ZVAL(ret, 0, 1); - return; } RETURN_ZVAL(phar_obj-arc.archive-metadata, 1, 0); } @@ -4590,7 +4589,6 @@ phar_parse_metadata(buf, ret, entry_obj-ent.entry-metadata_len TSRMLS_CC); efree(buf); RETURN_ZVAL(ret, 0, 1); - return; } RETURN_ZVAL(entry_obj-ent.entry-metadata, 1, 0); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
