[PHP-CVS] cvs: php-src /ext/oci8 config.m4
sixdFri Aug 10 06:58:13 2007 UTC Modified files: /php-src/ext/oci8 config.m4 Log: oci8: merge changes to build with Oracle Database 11g http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.68&r2=1.69&diff_format=u Index: php-src/ext/oci8/config.m4 diff -u php-src/ext/oci8/config.m4:1.68 php-src/ext/oci8/config.m4:1.69 --- php-src/ext/oci8/config.m4:1.68 Fri Jul 13 09:23:46 2007 +++ php-src/ext/oci8/config.m4 Fri Aug 10 06:58:12 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.68 2007/07/13 09:23:46 tony2001 Exp $ +dnl $Id: config.m4,v 1.69 2007/08/10 06:58:12 sixd Exp $ dnl if test -z "$SED"; then @@ -50,7 +50,16 @@ AC_DEFUN([AC_OCI8IC_VERSION],[ AC_MSG_CHECKING([Oracle Instant Client version]) - if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then + if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then +if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then + if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then +AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.11.1 not found]) + fi + OCI8_VERSION=11.1 +else + AC_MSG_ERROR([Oracle Instant Client library version not supported]) +fi + elif test -f $PHP_OCI8_INSTANT_CLIENT/libnnz10.$SHLIB_SUFFIX_NAME; then if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then AC_MSG_ERROR([Link from $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME to libclntsh.$SHLIB_SUFFIX_NAME.10.1 not found]) @@ -71,6 +80,8 @@ if test -s "$OCI8_DIR/orainst/unix.rgs"; then OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$OCI8_VERSION" && OCI8_VERSION=7.3 + elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then +OCI8_VERSION=11.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then OCI8_VERSION=10.1 elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then @@ -277,7 +288,7 @@ ;; -10.1) +11.1|10.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) AC_DEFINE(HAVE_OCI8_ATTR_STATEMENT,1,[ ]) @@ -382,7 +393,7 @@ AC_OCI8IC_VERSION($PHP_OCI8_INSTANT_CLIENT) case $OCI8_VERSION in -10.1) +11.1|10.1) PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) PHP_ADD_LIBPATH($PHP_OCI8_INSTANT_CLIENT, OCI8_SHARED_LIBADD) ;; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_oci config.m4
sixdFri Aug 10 06:57:41 2007 UTC Modified files: /php-src/ext/pdo_ociconfig.m4 Log: pdo_oci: merge changes to build with Oracle Database 11g http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.19&r2=1.20&diff_format=u Index: php-src/ext/pdo_oci/config.m4 diff -u php-src/ext/pdo_oci/config.m4:1.19 php-src/ext/pdo_oci/config.m4:1.20 --- php-src/ext/pdo_oci/config.m4:1.19 Thu Aug 2 19:37:30 2007 +++ php-src/ext/pdo_oci/config.m4 Fri Aug 10 06:57:41 2007 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2007/08/02 19:37:30 sixd Exp $ +dnl $Id: config.m4,v 1.20 2007/08/10 06:57:41 sixd Exp $ if test "$PHP_PDO" != "no"; then @@ -7,6 +7,8 @@ if test -s "$PDO_OCI_DIR/orainst/unix.rgs"; then PDO_OCI_VERSION=`grep '"ocommon"' $PDO_OCI_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` test -z "$PDO_OCI_VERSION" && PDO_OCI_VERSION=7.3 + elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then +PDO_OCI_VERSION=11.1 elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then PDO_OCI_VERSION=10.1 elif test -f $PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then @@ -88,10 +90,24 @@ elif test -f $PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include) AC_MSG_RESULT($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include) +elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then + PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/sdk/include) + AC_MSG_RESULT($PDO_OCI_IC_PREFIX/sdk/include) +elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then + PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/client/include) + AC_MSG_RESULT($PDO_OCI_IC_PREFIX/client/include) else AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install]) fi +if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib" +elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then + PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib" +elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then + PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX" +else + AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your Instant Client install]) +fi PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`" else if test -d "$PDO_OCI_DIR/rdbms/public"; then @@ -138,13 +154,15 @@ 9.0) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; - 10.1) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; 10.2) PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) ;; +11.1) + PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) + ;; *) AC_MSG_ERROR(Unsupported Oracle version! $PDO_OCI_VERSION) ;; @@ -229,7 +247,6 @@ [ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo) ]) - fi fi -- 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_2) / NEWS /ext/standard array.c
Yes, and I'm not gonna fix that broken test that was broken to begin with. Whoever added it should fix it. --Jani On Fri, 2007-08-10 at 02:16 +0400, Antony Dovgal wrote: > ext/standard/tests/array/extract.phpt is broken after this commit. > > On 08.08.2007 11:41, Jani Taskinen wrote: > > janiWed Aug 8 07:41:09 2007 UTC > > > > Modified files: (Branch: PHP_5_2) > > /php-srcNEWS > > /php-src/ext/standard array.c > > Log: > > - Fixed bug #42233 (Problems with УІУИУЅ in extract()). > > -- > 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 /ext/standard/tests/file tempnam_error.phpt
kraghubaFri Aug 10 03:33:00 2007 UTC Modified files: /php-src/ext/standard/tests/filetempnam_error.phpt Log: more new testcases for tempnam() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/tempnam_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/file/tempnam_error.phpt diff -u /dev/null php-src/ext/standard/tests/file/tempnam_error.phpt:1.2 --- /dev/null Fri Aug 10 03:33:00 2007 +++ php-src/ext/standard/tests/file/tempnam_error.phpt Fri Aug 10 03:33:00 2007 @@ -0,0 +1,72 @@ +--TEST-- +Test tempnam() function: error conditions +--FILE-- + +--EXPECTF-- +*** Testing tempnam() error conditions *** + +Warning: tempnam() expects exactly 2 parameters, 3 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 3 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 0 given in %s on line %d +NULL +*** Done *** +--UEXPECTF-- +*** Testing tempnam() error conditions *** + +Warning: tempnam() expects exactly 2 parameters, 3 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 3 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 1 given in %s on line %d +NULL + +Warning: tempnam() expects exactly 2 parameters, 0 given in %s on line %d +NULL +*** 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/standard/tests/strings strtolower-win32.phpt strtolower.phpt strtoupper1-win32.phpt strtoupper1.phpt
kraghubaFri Aug 10 03:03:49 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings strtoupper1-win32.phpt strtoupper1.phpt strtolower-win32.phpt strtolower.phpt Log: New testcases for strtolower() and strtoupper() functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strtoupper1-win32.phpt +++ php-src/ext/standard/tests/strings/strtoupper1-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strtoupper1.phpt +++ php-src/ext/standard/tests/strings/strtoupper1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strtolower-win32.phpt +++ php-src/ext/standard/tests/strings/strtolower-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtolower.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/strtolower.phpt +++ php-src/ext/standard/tests/strings/strtolower.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Thu Aug 9 07:37:19 2007 UTC Modified files: /CVSROOTavail Log: - give mattias ext/gd karma http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1297&r2=1.1298&diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1297 CVSROOT/avail:1.1298 --- CVSROOT/avail:1.1297Wed Aug 8 12:42:46 2007 +++ CVSROOT/avail Thu Aug 9 07:37:19 2007 @@ -308,5 +308,6 @@ # gd/libgd is the library itself, other directories are for # the various tools (website, bugs,...) avail|pajoye,edink,lhecking,mloskot,nlopess,scottmac,guenter,mattias|gd +avail|mattias|php-src/ext/gd # vim:set ft=conf sw=2 ts=2 et: -- 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 strtolower-win32.phpt strtolower.phpt strtoupper1-win32.phpt strtoupper1.phpt
kraghubaFri Aug 10 03:05:01 2007 UTC Modified files: /php-src/ext/standard/tests/strings strtoupper1-win32.phpt strtoupper1.phpt strtolower-win32.phpt strtolower.phpt Log: New testcases for strtolower() and strtoupper() functions http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strtoupper1-win32.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/strings/strtoupper1-win32.phpt diff -u /dev/null php-src/ext/standard/tests/strings/strtoupper1-win32.phpt:1.2 --- /dev/null Fri Aug 10 03:05:00 2007 +++ php-src/ext/standard/tests/strings/strtoupper1-win32.phpt Fri Aug 10 03:05:00 2007 @@ -0,0 +1,672 @@ +--TEST-- +Test strtoupper() function +--SKIPIF-- + +--FILE-- + ".(bin2hex(strtoupper(b"$char")))."\n"; +} + +echo "\n*** Testing strtoupper() with basic strings ***\n"; +$str = "Mary Had A liTTle LAmb and ShE loveD IT So\n"; +var_dump(strtoupper($str)); + +echo "\n*** Testing strtoupper() with various strings ***"; +/* strings to pass strtoupper() */ +$strings = array ( + "", + "string", + "stRINg0234", + "1.233.344StrinG12333", + "$$@@@ ABCDEF !!!***", + "ABCD\0abcdABCD", + NULL, + TRUE, + FALSE, + array() +); + +$count = 0; +/* loop through to check possible variations */ +foreach ($strings as $string) { + echo "\n-- Iteration $count --\n"; + var_dump( strtoupper($string) ); + $count++; +} + +echo "\n*** Testing strtoupper() with two different case strings ***\n"; +if (strtoupper("HeLLo woRLd") === strtoupper("hEllo WORLD")) + echo "strings are same, with Case Insensitive\n"; +else + echo "strings are not same\n"; + +echo "\n*** Testing error conditions ***"; +var_dump( strtoupper() ); /* Zero arguments */ +var_dump( strtoupper("a", "b") ); /* Arguments > Expected */ + +echo "*** Done ***"; +?> +--EXPECTF-- +*** Testing strtoupper() with all 256 chars *** +00 => 00 +01 => 01 +02 => 02 +03 => 03 +04 => 04 +05 => 05 +06 => 06 +07 => 07 +08 => 08 +09 => 09 +0a => 0a +0b => 0b +0c => 0c +0d => 0d +0e => 0e +0f => 0f +10 => 10 +11 => 11 +12 => 12 +13 => 13 +14 => 14 +15 => 15 +16 => 16 +17 => 17 +18 => 18 +19 => 19 +1a => 1a +1b => 1b +1c => 1c +1d => 1d +1e => 1e +1f => 1f +20 => 20 +21 => 21 +22 => 22 +23 => 23 +24 => 24 +25 => 25 +26 => 26 +27 => 27 +28 => 28 +29 => 29 +2a => 2a +2b => 2b +2c => 2c +2d => 2d +2e => 2e +2f => 2f +30 => 30 +31 => 31 +32 => 32 +33 => 33 +34 => 34 +35 => 35 +36 => 36 +37 => 37 +38 => 38 +39 => 39 +3a => 3a +3b => 3b +3c => 3c +3d => 3d +3e => 3e +3f => 3f +40 => 40 +41 => 41 +42 => 42 +43 => 43 +44 => 44 +45 => 45 +46 => 46 +47 => 47 +48 => 48 +49 => 49 +4a => 4a +4b => 4b +4c => 4c +4d => 4d +4e => 4e +4f => 4f +50 => 50 +51 => 51 +52 => 52 +53 => 53 +54 => 54 +55 => 55 +56 => 56 +57 => 57 +58 => 58 +59 => 59 +5a => 5a +5b => 5b +5c => 5c +5d => 5d +5e => 5e +5f => 5f +60 => 60 +61 => 41 +62 => 42 +63 => 43 +64 => 44 +65 => 45 +66 => 46 +67 => 47 +68 => 48 +69 => 49 +6a => 4a +6b => 4b +6c => 4c +6d => 4d +6e => 4e +6f => 4f +70 => 50 +71 => 51 +72 => 52 +73 => 53 +74 => 54 +75 => 55 +76 => 56 +77 => 57 +78 => 58 +79 => 59 +7a => 5a +7b => 7b +7c => 7c +7d => 7d +7e => 7e +7f => 7f +80 => 80 +81 => 81 +82 => 82 +83 => 83 +84 => 84 +85 => 85 +86 => 86 +87 => 87 +88 => 88 +89 => 89 +8a => 8a +8b => 8b +8c => 8c +8d => 8d +8e => 8e +8f => 8f +90 => 90 +91 => 91 +92 => 92 +93 => 93 +94 => 94 +95 => 95 +96 => 96 +97 => 97 +98 => 98 +99 => 99 +9a => 8a +9b => 9b +9c => 8c +9d => 9d +9e => 8e +9f => 9f +a0 => a0 +a1 => a1 +a2 => a2 +a3 => a3 +a4 => a4 +a5 => a5 +a6 => a6 +a7 => a7 +a8 => a8 +a9 => a9 +aa => aa +ab => ab +ac => ac +ad => ad +ae => ae +af => af +b0 => b0 +b1 => b1 +b2 => b2 +b3 => b3 +b4 => b4 +b5 => b5 +b6 => b6 +b7 => b7 +b8 => b8 +b9 => b9 +ba => ba +bb => bb +bc => bc +bd => bd +be => be +bf => bf +c0 => c0 +c1 => c1 +c2 => c2 +c3 => c3 +c4 => c4 +c5 => c5 +c6 => c6 +c7 => c7 +c8 => c8 +c9 => c9 +ca => ca +cb => cb +cc => cc +cd => cd +ce => ce +cf => cf +d0 => d0 +d1 => d1 +d2 => d2 +d3 => d3 +d4 => d4 +d5 => d5 +d6 => d6 +d7 => d7 +d8 => d8 +d9 => d9 +da => da +db => db +dc => dc +dd => dd +de => de +df => df +e0 => c0 +e1 => c1 +e2 => c2 +e3 => c3 +e4 => c4 +e5 => c5 +e6 => c6 +e7 => c7 +e8 => c8 +e9 => c9 +ea => ca +eb => cb +ec => cc +ed => cd +ee => ce +ef => cf +f0 => d0 +f1 => d1 +f2 => d2 +f3 => d3 +f4 => d4 +f5 => d5 +f6 => d6 +f7 => f7 +f8 => d8 +f9 => d9 +fa => da +fb => db +fc => dc +fd => dd +fe => de +ff => 9f + +*** Testing strtoupper() with basic strings *** +string(43) "MARY HAD A LITTLE LAMB AND SHE LOVED IT SO +" + +*** Testing strtoupper() with various strings *** +-- Iteration 0 -- +string(0) "" + +-- Iteration 1 -- +string(6) "STRING" + +-- Iteration 2 -- +string(10) "STRING0234" + +-- Iteration 3 -- +string(20) "1.233.344STRING12333" + +-- Iteration 4 -- +string(31) "$$@@@ ABCDEF !!!***" + +-- Iteration 5 --
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file copy_variation1.phpt copy_variation10.phpt copy_variation11.phpt copy_variation12-win32.phpt copy_variation12.phpt copy_variation13.phpt copy_v
kraghubaFri Aug 10 02:57:30 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filecopy_variation9.phpt copy_variation11.phpt copy_variation13.phpt copy_variation15.phpt copy_variation2-win32.phpt copy_variation17.phpt copy_variation4-win32.phpt copy_variation6-win32.phpt copy_variation12-win32.phpt copy_variation16-win32.phpt copy_variation2.phpt copy_variation4.phpt copy_variation6.phpt copy_variation8.phpt copy_variation10.phpt copy_variation12.phpt copy_variation14.phpt copy_variation16.phpt copy_variation18.phpt copy_variation3-win32.phpt copy_variation5-win32.phpt copy_variation1.phpt copy_variation3.phpt copy_variation5.phpt copy_variation7.phpt Log: More new testcases for copy() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation9.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation9.phpt +++ php-src/ext/standard/tests/file/copy_variation9.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation11.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation11.phpt +++ php-src/ext/standard/tests/file/copy_variation11.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation13.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation13.phpt +++ php-src/ext/standard/tests/file/copy_variation13.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation15.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation15.phpt +++ php-src/ext/standard/tests/file/copy_variation15.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation2-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation2-win32.phpt +++ php-src/ext/standard/tests/file/copy_variation2-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation17.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation17.phpt +++ php-src/ext/standard/tests/file/copy_variation17.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation4-win32.phpt +++ php-src/ext/standard/tests/file/copy_variation4-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation6-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation6-win32.phpt +++ php-src/ext/standard/tests/file/copy_variation6-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation12-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation12-win32.phpt +++ php-src/ext/standard/tests/file/copy_variation12-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation16-win32.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation16-win32.phpt +++ php-src/ext/standard/tests/file/copy_variation16-win32.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation2.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation2.phpt +++ php-src/ext/standard/tests/file/copy_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation4.phpt +++ php-src/ext/standard/tests/file/copy_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation6.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation6.phpt +++ php-src/ext/standard/tests/file/copy_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation8.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/file/copy_variation8.phpt +++ php-src/ext/standard/tests/file/copy_variation8.phpt http://cvs.php.net/viewvc.cgi/php-src/e
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/sybase php_sybase_db.c
iliaa Fri Aug 10 00:43:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/sybase php_sybase_db.c Log: Fixed bug #42242 (sybase_connect() crashes) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.891&r2=1.2027.2.547.2.892&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.891 php-src/NEWS:1.2027.2.547.2.892 --- php-src/NEWS:1.2027.2.547.2.891 Fri Aug 10 00:36:57 2007 +++ php-src/NEWSFri Aug 10 00:43:49 2007 @@ -6,6 +6,7 @@ - Fixed bug #42247 (ldap_parse_result() not defined under win32). (Jani) - Fixed bug #42243 (copy() does not ouput an error when the first arg is a dir). (Ilia) +- Fixed bug #42242 (sybase_connect() crashes). (Ilia) - Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped streams). (andrew dot minerd at sellingsource dot com, Ilia) - Fixed bug #42233 (Problems with æøå in extract()). (Jani) http://cvs.php.net/viewvc.cgi/php-src/ext/sybase/php_sybase_db.c?r1=1.66.2.5.2.5&r2=1.66.2.5.2.6&diff_format=u Index: php-src/ext/sybase/php_sybase_db.c diff -u php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.5 php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.6 --- php-src/ext/sybase/php_sybase_db.c:1.66.2.5.2.5 Fri Mar 16 21:59:17 2007 +++ php-src/ext/sybase/php_sybase_db.c Fri Aug 10 00:43:50 2007 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: php_sybase_db.c,v 1.66.2.5.2.5 2007/03/16 21:59:17 stas Exp $ */ +/* $Id: php_sybase_db.c,v 1.66.2.5.2.6 2007/08/10 00:43:50 iliaa Exp $ */ #ifdef HAVE_CONFIG_H @@ -355,7 +355,7 @@ host = Z_STRVAL_PP(yyhost); user = Z_STRVAL_PP(yyuser); passwd = Z_STRVAL_PP(yypasswd); - spprintf(&hashed_details, 0, "sybase_%s_%s_%s__", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd)); + hashed_details_length = spprintf(&hashed_details, 0, "sybase_%s_%s_%s__", Z_STRVAL_PP(yyhost), Z_STRVAL_PP(yyuser), Z_STRVAL_PP(yypasswd)); } break; case 4: { -- 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 file.c
iliaa Fri Aug 10 00:36:57 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard file.c /php-srcNEWS Log: Fixed bug #42243 (copy() does not ouput an error when the first arg is a dir). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.22&r2=1.409.2.6.2.23&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.22 php-src/ext/standard/file.c:1.409.2.6.2.23 --- php-src/ext/standard/file.c:1.409.2.6.2.22 Wed Aug 8 22:32:24 2007 +++ php-src/ext/standard/file.c Fri Aug 10 00:36:57 2007 @@ -21,7 +21,7 @@ +--+ */ -/* $Id: file.c,v 1.409.2.6.2.22 2007/08/08 22:32:24 tony2001 Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.23 2007/08/10 00:36:57 iliaa Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1765,6 +1765,10 @@ if (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET, &dest_s, NULL) != 0) { goto safe_to_copy; } + if (S_ISDIR(src_s.sb.st_mode)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The first argument to copy() function cannot be a directory."); + return FAILURE; + } if (!src_s.sb.st_ino || !dest_s.sb.st_ino) { goto no_stat; } http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.890&r2=1.2027.2.547.2.891&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.890 php-src/NEWS:1.2027.2.547.2.891 --- php-src/NEWS:1.2027.2.547.2.890 Fri Aug 10 00:30:04 2007 +++ php-src/NEWSFri Aug 10 00:36:57 2007 @@ -4,6 +4,8 @@ - Fixed bug #42261 (header wrong for date field). (roberto at spadim dot com dot br, Ilia) - Fixed bug #42247 (ldap_parse_result() not defined under win32). (Jani) +- Fixed bug #42243 (copy() does not ouput an error when the first arg is a + dir). (Ilia) - Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped streams). (andrew dot minerd at sellingsource dot com, Ilia) - Fixed bug #42233 (Problems with æøå in extract()). (Jani) -- 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/dbase dbf_head.c
iliaa Fri Aug 10 00:30:05 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/dbase dbf_head.c Log: Fixed bug #42261 (header wrong for date field). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.889&r2=1.2027.2.547.2.890&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.889 php-src/NEWS:1.2027.2.547.2.890 --- php-src/NEWS:1.2027.2.547.2.889 Thu Aug 9 23:27:22 2007 +++ php-src/NEWSFri Aug 10 00:30:04 2007 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? Aug 2007, PHP 5.2.4 +- Fixed bug #42261 (header wrong for date field). (roberto at spadim dot com + dot br, Ilia) - Fixed bug #42247 (ldap_parse_result() not defined under win32). (Jani) - Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped streams). (andrew dot minerd at sellingsource dot com, Ilia) http://cvs.php.net/viewvc.cgi/php-src/ext/dbase/dbf_head.c?r1=1.14.4.1.2.6&r2=1.14.4.1.2.7&diff_format=u Index: php-src/ext/dbase/dbf_head.c diff -u php-src/ext/dbase/dbf_head.c:1.14.4.1.2.6 php-src/ext/dbase/dbf_head.c:1.14.4.1.2.7 --- php-src/ext/dbase/dbf_head.c:1.14.4.1.2.6 Wed May 16 13:17:50 2007 +++ php-src/ext/dbase/dbf_head.cFri Aug 10 00:30:04 2007 @@ -157,6 +157,9 @@ dbf->db_flen = dbfield.dbf_flen[0]; dbf->db_fdc = dbfield.dbf_flen[1]; break; +case 'D': + dbf->db_flen = 8; + break; default: dbf->db_flen = get_short(dbfield.dbf_flen); break; -- 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/bz2 bz2_filter.c
iliaa Thu Aug 9 23:27:22 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/bz2bz2_filter.c /php-srcNEWS Log: Fixed bug #42117 (bzip2.compress loses data in internal buffer) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.4&r2=1.3.2.2.2.5&diff_format=u Index: php-src/ext/bz2/bz2_filter.c diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.4 php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5 --- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.4Thu Jan 25 12:22:21 2007 +++ php-src/ext/bz2/bz2_filter.cThu Aug 9 23:27:22 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: bz2_filter.c,v 1.3.2.2.2.4 2007/01/25 12:22:21 tony2001 Exp $ */ +/* $Id: bz2_filter.c,v 1.3.2.2.2.5 2007/08/09 23:27:22 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -228,8 +228,8 @@ if (flags & PSFS_FLAG_FLUSH_CLOSE) { /* Spit it out! */ - status = BZ_OUTBUFF_FULL; - while (status == BZ_OUTBUFF_FULL) { + status = BZ_FINISH_OK; + while (status == BZ_FINISH_OK) { status = BZ2_bzCompress(&(data->strm), BZ_FINISH); if (data->strm.avail_out < data->outbuf_len) { size_t bucketlen = data->outbuf_len - data->strm.avail_out; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.888&r2=1.2027.2.547.2.889&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.888 php-src/NEWS:1.2027.2.547.2.889 --- php-src/NEWS:1.2027.2.547.2.888 Thu Aug 9 08:43:09 2007 +++ php-src/NEWSThu Aug 9 23:27:22 2007 @@ -13,6 +13,8 @@ - Fixed bug #42198 (SCRIPT_NAME and PHP_SELF truncated when inside a userdir and using PATH_INFO). (Dmitry) - Fixed bug #42195 (C++ compiler required always). (Jani) +- Fixed bug #42117 (bzip2.compress loses data in internal buffer). (Philip, + Ilia) - Fixed bug #42082 (NodeList length zero should be empty). (Hannes) - Fixed bug #41973 (./configure --with-ldap=shared fails with LDFLAGS="-Wl,--as-needed"). (Nuno) -- 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_2) /ext/standard/tests/file
ext/standard/tests/file/tempnam_variation2.phpt fails in ZTS mode. I would suggest creating separate test case for "." path and disable it when ZTS is enabled. The problem is that PHP's chdir() in ZTS doesn't really do chdir(), 'cause it would affect whole process. So mkstemp() creates temp files in cwd of the process, not cwd of the thread. I'll meditate on creating thread-safe wrapper for mkstemp()/mktemp() though.. On 09.08.2007 07:34, Raghubansh Kumar wrote: kraghubaThu Aug 9 03:34:00 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/file tempnam_variation3-win32.phpt tempnam_variation1.phpt tempnam_variation2.phpt -- 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 /ext/tokenizer tokenizer_data_gen.sh
johannesThu Aug 9 22:24:42 2007 UTC Modified files: /php-src/ext/tokenizer tokenizer_data_gen.sh Log: - Write to the correct file... http://cvs.php.net/viewvc.cgi/php-src/ext/tokenizer/tokenizer_data_gen.sh?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/tokenizer/tokenizer_data_gen.sh diff -u php-src/ext/tokenizer/tokenizer_data_gen.sh:1.1 php-src/ext/tokenizer/tokenizer_data_gen.sh:1.2 --- php-src/ext/tokenizer/tokenizer_data_gen.sh:1.1 Tue Jul 31 23:23:37 2007 +++ php-src/ext/tokenizer/tokenizer_data_gen.sh Thu Aug 9 22:24:41 2007 @@ -1,7 +1,7 @@ #!/bin/sh INFILE="../../Zend/zend_language_parser.c" -OUTFILE="tokenizer_data.h" +OUTFILE="tokenizer_data.c" AWK=awk @@ -30,7 +30,7 @@ +--+ */ -/* $Id: tokenizer_data_gen.sh,v 1.1 2007/07/31 23:23:37 johannes Exp $ */ +/* $Id: tokenizer_data_gen.sh,v 1.2 2007/08/09 22:24:41 johannes Exp $ */ /* DO NOT EDIT THIS FILE! -- 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_2) / NEWS /ext/standard array.c
ext/standard/tests/array/extract.phpt is broken after this commit. On 08.08.2007 11:41, Jani Taskinen wrote: janiWed Aug 8 07:41:09 2007 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/ext/standard array.c Log: - Fixed bug #42233 (Problems with УІУИУЅ in extract()). -- 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 /ext/gd/libgd gd_gd.c /ext/gd/tests libgd00101.gd libgd00101.phpt
mattias Thu Aug 9 14:22:38 2007 UTC Modified files: /php-src/ext/gd/libgd gd_gd.c /php-src/ext/gd/tests libgd00101.phpt libgd00101.gd Log: -MFB: libgd #101, imagecreatefromgd can crash if gdImageCreate fails http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd.c?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/gd/libgd/gd_gd.c diff -u php-src/ext/gd/libgd/gd_gd.c:1.8 php-src/ext/gd/libgd/gd_gd.c:1.9 --- php-src/ext/gd/libgd/gd_gd.c:1.8Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gd_gd.cThu Aug 9 14:22:38 2007 @@ -122,6 +122,9 @@ } else { im = gdImageCreate(*sx, *sy); } + if(!im) { + goto fail1; + } if (!_gdGetColors(in, im, gd2xFlag)) { goto fail2; } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/libgd00101.phpt diff -u /dev/null php-src/ext/gd/tests/libgd00101.phpt:1.2 --- /dev/null Thu Aug 9 14:22:38 2007 +++ php-src/ext/gd/tests/libgd00101.phptThu Aug 9 14:22:38 2007 @@ -0,0 +1,18 @@ +--TEST-- +libgd #101 (imagecreatefromgd can crash if gdImageCreate fails) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imagecreatefromgd(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully + in %slibgd00101.php on line %d + +Warning: imagecreatefromgd(): '%slibgd00101.gd' is not a valid GD file in %slibgd00101.php on line %d +bool(false) http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.gd?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/libgd00101.gd diff -u /dev/null php-src/ext/gd/tests/libgd00101.gd:1.2 --- /dev/null Thu Aug 9 14:22:38 2007 +++ php-src/ext/gd/tests/libgd00101.gd Thu Aug 9 14:22:38 2007 @@ -0,0 +1 @@ +ÿýÿý \ No newline at end of file -- 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/gd/libgd gd_gd.c /ext/gd/tests libgd00101.gd libgd00101.phpt
mattias Thu Aug 9 14:21:38 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/gd/tests libgd00101.phpt libgd00101.gd Modified files: /php-src/ext/gd/libgd gd_gd.c Log: - libgd #101, imagecreatefromgd can crash if gdImageCreate fails http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd.c?r1=1.8&r2=1.8.6.1&diff_format=u Index: php-src/ext/gd/libgd/gd_gd.c diff -u php-src/ext/gd/libgd/gd_gd.c:1.8 php-src/ext/gd/libgd/gd_gd.c:1.8.6.1 --- php-src/ext/gd/libgd/gd_gd.c:1.8Mon Mar 29 18:20:33 2004 +++ php-src/ext/gd/libgd/gd_gd.cThu Aug 9 14:21:38 2007 @@ -122,6 +122,9 @@ } else { im = gdImageCreate(*sx, *sy); } + if(!im) { + goto fail1; + } if (!_gdGetColors(in, im, gd2xFlag)) { goto fail2; } http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.phpt?view=markup&rev=1.1 Index: php-src/ext/gd/tests/libgd00101.phpt +++ php-src/ext/gd/tests/libgd00101.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00101.gd?view=markup&rev=1.1 Index: php-src/ext/gd/tests/libgd00101.gd +++ php-src/ext/gd/tests/libgd00101.gd -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/libgd xbm.c /ext/gd/tests libgd00094.phpt libgd00094.xbm
mattias Thu Aug 9 12:09:30 2007 UTC Modified files: /php-src/ext/gd/libgd xbm.c /php-src/ext/gd/tests libgd00094.phpt libgd00094.xbm Log: -MFB: libgd #94, imagecreatefromxbm can crash if gdImageCreate fails http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/xbm.c?r1=1.10&r2=1.11&diff_format=u Index: php-src/ext/gd/libgd/xbm.c diff -u php-src/ext/gd/libgd/xbm.c:1.10 php-src/ext/gd/libgd/xbm.c:1.11 --- php-src/ext/gd/libgd/xbm.c:1.10 Mon Jan 1 09:29:24 2007 +++ php-src/ext/gd/libgd/xbm.c Thu Aug 9 12:09:30 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xbm.c,v 1.10 2007/01/01 09:29:24 sebastian Exp $ */ +/* $Id: xbm.c,v 1.11 2007/08/09 12:09:30 mattias Exp $ */ #include #include @@ -96,7 +96,9 @@ return 0; } - im = gdImageCreate(width, height); + if(!(im = gdImageCreate(width, height))) { + return 0; + } gdImageColorAllocate(im, 255, 255, 255); gdImageColorAllocate(im, 0, 0, 0); h[2] = '\0'; http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00094.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/libgd00094.phpt diff -u /dev/null php-src/ext/gd/tests/libgd00094.phpt:1.2 --- /dev/null Thu Aug 9 12:09:30 2007 +++ php-src/ext/gd/tests/libgd00094.phptThu Aug 9 12:09:30 2007 @@ -0,0 +1,19 @@ +--TEST-- +libgd #94 (imagecreatefromxbm can crash if gdImageCreate fails) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: imagecreatefromxbm(): gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully + in %slibgd00094.php on line %d + +Warning: imagecreatefromxbm(): '%slibgd00094.xbm' is not a valid XBM file in %slibgd00094.php on line %d +bool(false) + http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00094.xbm?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/libgd00094.xbm diff -u /dev/null php-src/ext/gd/tests/libgd00094.xbm:1.2 --- /dev/null Thu Aug 9 12:09:30 2007 +++ php-src/ext/gd/tests/libgd00094.xbm Thu Aug 9 12:09:30 2007 @@ -0,0 +1,3 @@ +#define width 255 +#define height 1073741824 +static unsigned char bla = { -- 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/gd/libgd xbm.c /ext/gd/tests libgd00094.phpt libgd00094.xbm
mattias Thu Aug 9 12:08:29 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/gd/tests libgd00094.phpt libgd00094.xbm Modified files: /php-src/ext/gd/libgd xbm.c Log: - libgd #94, imagecreatefromxbm can crash if gdImageCreate fails http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/xbm.c?r1=1.7.2.2.2.1&r2=1.7.2.2.2.2&diff_format=u Index: php-src/ext/gd/libgd/xbm.c diff -u php-src/ext/gd/libgd/xbm.c:1.7.2.2.2.1 php-src/ext/gd/libgd/xbm.c:1.7.2.2.2.2 --- php-src/ext/gd/libgd/xbm.c:1.7.2.2.2.1 Mon Jan 1 09:36:01 2007 +++ php-src/ext/gd/libgd/xbm.c Thu Aug 9 12:08:29 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: xbm.c,v 1.7.2.2.2.1 2007/01/01 09:36:01 sebastian Exp $ */ +/* $Id: xbm.c,v 1.7.2.2.2.2 2007/08/09 12:08:29 mattias Exp $ */ #include #include @@ -96,7 +96,9 @@ return 0; } - im = gdImageCreate(width, height); + if(!(im = gdImageCreate(width, height))) { + return 0; + } gdImageColorAllocate(im, 255, 255, 255); gdImageColorAllocate(im, 0, 0, 0); h[2] = '\0'; http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00094.phpt?view=markup&rev=1.1 Index: php-src/ext/gd/tests/libgd00094.phpt +++ php-src/ext/gd/tests/libgd00094.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/libgd00094.xbm?view=markup&rev=1.1 Index: php-src/ext/gd/tests/libgd00094.xbm +++ php-src/ext/gd/tests/libgd00094.xbm -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysql/tests mysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch_lengths.phpt mysql_fetch_object.phpt mysql_fetch_row.phpt mysql_field_flags.php
uw Thu Aug 9 11:53:17 2007 UTC Added files: /php-src/ext/mysql/testsskipifconnectfailure.inc Modified files: /php-src/ext/mysql/testsmysql_fetch_array.phpt mysql_fetch_assoc.phpt mysql_fetch_field.phpt mysql_fetch_lengths.phpt mysql_fetch_object.phpt mysql_fetch_row.phpt mysql_field_flags.phpt mysql_field_len.phpt mysql_field_name.phpt mysql_field_seek.phpt mysql_field_table.phpt mysql_field_type.phpt mysql_free_result.phpt mysql_get_host_info.phpt mysql_get_proto_info.phpt mysql_get_server_info.phpt mysql_info.phpt mysql_insert_id.phpt mysql_list_dbs.phpt mysql_list_fields.phpt mysql_list_processes.phpt mysql_list_tables.phpt mysql_num_fields.phpt mysql_num_rows.phpt mysql_pconnect.phpt mysql_phpinfo.phpt mysql_ping.phpt mysql_query.phpt mysql_real_escape_string.phpt mysql_result.phpt mysql_select_db.phpt mysql_set_charset.phpt mysql_stat.phpt mysql_tablename.phpt mysql_thread_id.phpt mysql_unbuffered_query.phpt Log: Same as for ext/mysqli tests: addition of a new environment variable MYSQL_TEST_SKIP_CONNECT_FAILURE which controls how to deal with connection problems. If MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) connection problems will make a test fail. If you set MYSQL_TEST_SKIP_CONNECT_FAILURE to any value that evaluates to true in PHP, a test which cannot connect to the database will be skipped. http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_array.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_array.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.2 php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.3 --- php-src/ext/mysql/tests/mysql_fetch_array.phpt:1.2 Wed Jul 11 13:36:11 2007 +++ php-src/ext/mysql/tests/mysql_fetch_array.phpt Thu Aug 9 11:53:17 2007 @@ -1,7 +1,10 @@ --TEST-- mysql_fetch_array() --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_assoc.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_assoc.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2 php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.3 --- php-src/ext/mysql/tests/mysql_fetch_assoc.phpt:1.2 Wed Jul 11 13:29:41 2007 +++ php-src/ext/mysql/tests/mysql_fetch_assoc.phpt Thu Aug 9 11:53:17 2007 @@ -1,7 +1,10 @@ --TEST-- mysql_fetch_assoc() --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_field.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_field.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.3 php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.4 --- php-src/ext/mysql/tests/mysql_fetch_field.phpt:1.3 Mon Jul 23 07:51:37 2007 +++ php-src/ext/mysql/tests/mysql_fetch_field.phpt Thu Aug 9 11:53:17 2007 @@ -1,7 +1,10 @@ --TEST-- mysql_fetch_field() --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_lengths.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_lengths.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.2 php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.3 --- php-src/ext/mysql/tests/mysql_fetch_lengths.phpt:1.2Wed Jul 11 13:51:31 2007 +++ php-src/ext/mysql/tests/mysql_fetch_lengths.phptThu Aug 9 11:53:17 2007 @@ -1,7 +1,10 @@ --TEST-- mysql_fetch_lengths() --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_object.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_object.phpt diff -u php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.2 php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.3 --- php-src/ext/mysql/tests/mysql_fetch_object.phpt:1.2 Wed Jul 11 13:56:37 2007 +++ php-src/ext/mysql/tests/mysql_fetch_object.phpt Thu Aug 9 11:53:17 2007 @@ -1,7 +1,10 @@ --TEST-- mysql_fetch_object() --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_fetch_row.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysql/tests/mysql_fetch_row.phpt diff
[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_connect_oo_warnings.phpt
uw Thu Aug 9 10:10:46 2007 UTC Modified files: /php-src/ext/mysqli/tests mysqli_connect_oo_warnings.phpt Log: No need for an extra skip*.inc file, this check is done in just one place http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt diff -u php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.2 php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.3 --- php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phpt:1.2Thu Aug 9 10:01:19 2007 +++ php-src/ext/mysqli/tests/mysqli_connect_oo_warnings.phptThu Aug 9 10:10:46 2007 @@ -5,7 +5,8 @@ require_once('skipif.inc'); require_once('skipifemb.inc'); require_once('skipifconnectfailure.inc'); - require_once('skipifnodefuser.inc'); + if (!get_current_user()) + die('skip: get_current_user() not supported'); if (stristr(mysqli_get_client_info(), 'mysqlnd')) die("skip: test for libmysql (different error output when using php streams"); ?> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests local_infile_tools.inc reflection_tools.inc
uw Thu Aug 9 10:16:24 2007 UTC Added files: /php-src/ext/mysqli/tests reflection_tools.inc local_infile_tools.inc Log: I forgot those files when merging mysqlnd SVN and HEAD. Only required by tests that test experimental features and are skipped by default that's why I missed them. http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/reflection_tools.inc?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/reflection_tools.inc +++ php-src/ext/mysqli/tests/reflection_tools.inc getName()); printf("isInternal: %s\n", ($class->isInternal()) ? 'yes' : 'no'); printf("isUserDefined: %s\n", ($class->isUserDefined()) ? 'yes' : 'no'); printf("isInstantiable: %s\n", ($class->isInstantiable()) ? 'yes' : 'no'); printf("isInterface: %s\n", ($class->isInterface()) ? 'yes' : 'no'); printf("isAbstract: %s\n", ($class->isAbstract()) ? 'yes' : 'no'); printf("isFinal: %s\n", ($class->isFinal()) ? 'yes' : 'no'); printf("isIteratable: %s\n", ($class->isIterateable()) ? 'yes' : 'no'); printf("Modifiers: '%d'\n", $class->getModifiers()); printf("Parent Class: '%s'\n", $class->getParentClass()); printf("Extension: '%s'\n", $class->getExtensionName()); if ($method = $class->getConstructor()) inspectMethod($method); if ($methods = $class->getMethods()) { $tmp = array(); foreach ($methods as $method) $tmp[$method->getName()] = $method; ksort($tmp, SORT_STRING); foreach ($tmp as $method) inspectMethod($method); } if ($properties = $class->getProperties()) { $tmp = array(); foreach ($properties as $prop) $tmp[$prop->getName()] = $prop; ksort($tmp, SORT_STRING); foreach ($tmp as $prop) inspectProperty($prop); } if ($properties = $class->getDefaultProperties()) { ksort($properties, SORT_STRING); foreach ($properties as $name => $v) printf("Default property '%s'\n", $name); } if ($properties = $class->getStaticProperties()) { ksort($properties, SORT_STRING); foreach ($properties as $name => $v) printf("Static property '%s'\n", $name); } if ($constants = $class->getConstants()) { ksort($constants, SORT_STRING); foreach ($constant as $name => $value) printf("Constant '%s' = '%s'\n", $name, $value); } } function inspectProperty(&$prop) { printf("\nInspecting property '%s'\n", $prop->getName()); printf("isPublic: %s\n", ($prop->isPublic()) ? 'yes' : 'no'); printf("isPrivate: %s\n", ($prop->isPrivate()) ? 'yes' : 'no'); printf("isProtected: %s\n", ($prop->isProtected()) ? 'yes' : 'no'); printf("isStatic: %s\n", ($prop->isStatic()) ? 'yes' : 'no'); printf("isDefault: %s\n", ($prop->isDefault()) ? 'yes' : 'no'); printf("Modifiers: %d\n", $prop->getModifiers()); // printf("Value\n"); var_export($prop->getValue()); } function inspectMethod(&$method) { printf("\nInspecting method '%s'\n", $method->getName()); printf("isFinal: %s\n", ($method->isFinal()) ? 'yes' : 'no'); printf("isAbstract: %s\n", ($method->isAbstract()) ? 'yes' : 'no'); printf("isPublic: %s\n", ($method->isPublic()) ? 'yes' : 'no'); printf("isPrivate: %s\n", ($method->isPrivate()) ? 'yes' : 'no'); printf("isProtected: %s\n", ($method->isProtected()) ? 'yes' : 'no'); printf("isStatic: %s\n", ($method->isStatic()) ? 'yes' : 'no'); printf("isConstructor: %s\n", ($method->isConstructor()) ? 'yes' : 'no'); printf("isDestructor: %s\n", ($method->isDestructor()) ? 'yes' : 'no'); printf("isInternal: %s\n", ($method->isInternal()) ? 'yes' : 'no'); printf("isUserDefined: %s\n", ($method->isUserDefined()) ? 'yes' : 'no'); printf("returnsReference: %s\n", ($method->returnsReference()) ? 'yes' : 'no'); printf("Modifiers: %d\n", $method->getModifiers()); printf("Number of Parameters: %d\n", $method->getNu
[PHP-CVS] cvs: php-src /ext/mysqli/tests mysqli_master_query.phpt mysqli_rpl_parse_enabled.phpt mysqli_rpl_probe.phpt mysqli_rpl_query_type.phpt mysqli_send_query.phpt mysqli_slave_query.phpt
uw Thu Aug 9 09:59:15 2007 UTC Added files: /php-src/ext/mysqli/tests mysqli_master_query.phpt mysqli_rpl_parse_enabled.phpt mysqli_rpl_probe.phpt mysqli_rpl_query_type.phpt mysqli_send_query.phpt mysqli_slave_query.phpt Log: New tests (stubs?) for a few experimental (to be removed?) functions. The tests will only be run if you set MYSQL_TEST_EXPERIMENTAL = 1. http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_master_query.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_master_query.phpt +++ php-src/ext/mysqli/tests/mysqli_master_query.phpt --TEST-- mysqli_master_query() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_master_query(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_rpl_parse_enabled.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_rpl_parse_enabled.phpt +++ php-src/ext/mysqli/tests/mysqli_rpl_parse_enabled.phpt --TEST-- mysqli_rpl_parse_enabled() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_rpl_parse_enabled(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_rpl_probe.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_rpl_probe.phpt +++ php-src/ext/mysqli/tests/mysqli_rpl_probe.phpt --TEST-- mysqli_rpl_probe() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_rpl_probe(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_rpl_query_type.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_rpl_query_type.phpt +++ php-src/ext/mysqli/tests/mysqli_rpl_query_type.phpt --TEST-- mysqli_rpl_query_type() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_rpl_query_type(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_send_query.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_send_query.phpt +++ php-src/ext/mysqli/tests/mysqli_send_query.phpt --TEST-- mysqli_send_query() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_send_query(): Couldn't fetch mysqli in %s on line %d done! http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/mysqli_slave_query.phpt?view=markup&rev=1.1 Index: php-src/ext/mysqli/tests/mysqli_slave_query.phpt +++ php-src/ext/mysqli/tests/mysqli_slave_query.phpt --TEST-- mysqli_slave_query() --SKIPIF-- --FILE-- --EXPECTF-- Warning: mysqli_slave_query(): Couldn't fetch mysqli in %s on line %d done! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests bug28817.phpt bug29311.phpt bug30967.phpt bug31668.phpt bug32405.phpt bug33090.phpt bug33263.phpt bug33491.phpt bug34785.phpt bug34810.phpt bug35103.phpt bug35
uw Thu Aug 9 09:43:28 2007 UTC Modified files: /php-src/ext/mysqli/tests bug37090.phpt bug28817.phpt bug29311.phpt bug30967.phpt bug31668.phpt bug32405.phpt bug33090.phpt bug33263.phpt bug33491.phpt bug34785.phpt bug34810.phpt bug35103.phpt bug35517.phpt bug35759.phpt bug36420.phpt bug36745.phpt bug36949.phpt bug38710.phpt Log: Next set of files which now feature the new environment variable MYSQL_TEST_SKIP_CONNECT_FAILURE which controls how connection problems are handled: failure (MYSQL_TEST_SKIP_CONNECT_FAILURE = false, default) or skip (MYSQL_TEST_SKIP_CONNECT_FAILURE = true) Also, some minor tweaking of connection parameters in the tests. http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug37090.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysqli/tests/bug37090.phpt diff -u /dev/null php-src/ext/mysqli/tests/bug37090.phpt:1.2 --- /dev/null Thu Aug 9 09:43:28 2007 +++ php-src/ext/mysqli/tests/bug37090.phpt Thu Aug 9 09:43:28 2007 @@ -0,0 +1,48 @@ +--TEST-- +Bug #37090 (mysqli_set_charset return code) +--SKIPIF-- + +--FILE-- +set_charset("latin5"); + $cs[] = $mysql->character_set_name(); + + $cs[] = $mysql->set_charset("utf8"); + $cs[] = $mysql->character_set_name(); + + $cs[] = $mysql->set_charset("notdefined"); + $cs[] = $mysql->character_set_name(); + + var_dump($cs); + print "done!"; +?> +--EXPECT-- +array(6) { + [0]=> + bool(true) + [1]=> + string(6) "latin5" + [2]=> + bool(true) + [3]=> + string(4) "utf8" + [4]=> + bool(false) + [5]=> + string(4) "utf8" +} +done! \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug28817.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/bug28817.phpt diff -u php-src/ext/mysqli/tests/bug28817.phpt:1.4 php-src/ext/mysqli/tests/bug28817.phpt:1.5 --- php-src/ext/mysqli/tests/bug28817.phpt:1.4 Mon May 7 17:23:04 2007 +++ php-src/ext/mysqli/tests/bug28817.phpt Thu Aug 9 09:43:28 2007 @@ -1,7 +1,10 @@ --TEST-- Bug #28817 (problems with properties declared in the class extending MySQLi) --SKIPIF-- - + --FILE-- p_test); @var_dump($mysql->errno); - $mysql->connect($host, $user, $passwd); + $mysql->connect($host, $user, $passwd, $db, $port, $socket); $mysql->select_db("nonexistingdb"); var_dump($mysql->errno > 0); - $mysql->close(); + $mysql->close(); ?> --EXPECTF-- array(2) { @@ -36,4 +39,4 @@ %s(3) "bar" } NULL -bool(true) +bool(true) \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug29311.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/mysqli/tests/bug29311.phpt diff -u php-src/ext/mysqli/tests/bug29311.phpt:1.3 php-src/ext/mysqli/tests/bug29311.phpt:1.4 --- php-src/ext/mysqli/tests/bug29311.phpt:1.3 Sat Dec 4 08:50:33 2004 +++ php-src/ext/mysqli/tests/bug29311.phpt Thu Aug 9 09:43:28 2007 @@ -1,7 +1,10 @@ --TEST-- constructor test --SKIPIF-- - + --FILE-- connect($host, $user, $passwd, "test"); + global $host, $user, $passwd, $db, $port, $socket; + $this->connect($host, $user, $passwd, $db, $port, $socket); } } @@ -30,7 +33,7 @@ $foo[0] = new mysql1(); $foo[1] = new mysql2(); - $foo[2] = new mysql3($host, $user, $passwd, "test"); + $foo[2] = new mysql3($host, $user, $passwd, $db, $port, $socket); for ($i=0; $i < 3; $i++) { http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug30967.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/mysqli/tests/bug30967.phpt diff -u php-src/ext/mysqli/tests/bug30967.phpt:1.5 php-src/ext/mysqli/tests/bug30967.phpt:1.6 --- php-src/ext/mysqli/tests/bug30967.phpt:1.5 Mon May 7 17:23:04 2007 +++ php-src/ext/mysqli/tests/bug30967.phpt Thu Aug 9 09:43:28 2007 @@ -1,7 +1,10 @@ --TEST-- Bug #30967 (problems with properties declared in the class extending the class extending MySQLi) --SKIPIF-- - + --FILE-- query("THIS DOES NOT WORK"); printf("%d\n", $mysql->errno); - $mysql->close(); + $mysql->close(); ?> --EXPECTF-- 1064 http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/bug31668.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/mysqli/tests/bug31668.phpt diff -u php-src/ext/mysqli/tests/bug31668.phpt:1.4 php-src/ext/mysqli/tests/bug31668.phpt:1.5 --- php-src/ext/mysqli/tests/bug31668.phpt:1.4 Mon May 7 17:23:04 2007 +++ php-src/ext/mysqli/tests/bug31668.phpt Thu Aug 9 09:43:28 2007 @@ -1,15 +1,18 @@ --TEST-- Bug #31668 (multi_query works exactly every other time (multi_query was global, now per connection)) --SKIPIF-- - + --FILE-- multi_query('SELECT 1;SELECT 2'); do { -
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file fgetcsv_error.phpt
On 09.08.2007 10:14, Nikhil Gupta wrote: Hi Tony, The purpose of testcase (fgetcsv_variation14.phpt) is to read from end of file.The use of feof() in the testcase is to check for the file pointer pointing to end of file. This check is required to confirm the position of file pointer before and after the read function by fgetcsv(). I think this check is required here. I don't understand why it's required to test feof() in fgetcsv() tests (perhaps you need a separate test for feof() in this case?) and the expected result of the check is definitely wrong. fgetcsv() reads up to the end of line, which happens to be the end of file too, but feof() returns false because the function stopped right in the end, it didn't try to read more, so it didn't get EOF or truncated data. feof() returns bool(false) in this case in all recent PHP versions (4.4, 5.2.3, 5.2), so I dunno why the tests expect bool(true). -- 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_2) / NEWS
janiThu Aug 9 08:43:09 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: bfn http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.887&r2=1.2027.2.547.2.888&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.887 php-src/NEWS:1.2027.2.547.2.888 --- php-src/NEWS:1.2027.2.547.2.887 Wed Aug 8 13:32:46 2007 +++ php-src/NEWSThu Aug 9 08:43:09 2007 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Aug 2007, PHP 5.2.4 +- Fixed bug #42247 (ldap_parse_result() not defined under win32). (Jani) - Fixed bug #42237 (stream_copy_to_stream returns invalid values for mmaped streams). (andrew dot minerd at sellingsource dot com, Ilia) - Fixed bug #42233 (Problems with æøÃÂ¥ in extract()). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/ldap config.w32
janiThu Aug 9 08:42:43 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/ldap config.w32 Log: MFH:- Fixed bug #42247 (ldap_parse_result() not defined under win32) http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/config.w32?r1=1.2&r2=1.2.4.1&diff_format=u Index: php-src/ext/ldap/config.w32 diff -u php-src/ext/ldap/config.w32:1.2 php-src/ext/ldap/config.w32:1.2.4.1 --- php-src/ext/ldap/config.w32:1.2 Sat Oct 23 23:03:52 2004 +++ php-src/ext/ldap/config.w32 Thu Aug 9 08:42:43 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.2 2004/10/23 23:03:52 hholzgra Exp $ +// $Id: config.w32,v 1.2.4.1 2007/08/09 08:42:43 jani Exp $ // vim:ft=javascript ARG_WITH("ldap", "LDAP support", "no"); @@ -12,6 +12,7 @@ CHECK_LIB("olber32.lib", "ldap", PHP_LDAP)) { EXTENSION('ldap', 'ldap.c'); + AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1); AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1); AC_DEFINE('HAVE_LDAP_START_TLS_S', 1); AC_DEFINE('HAVE_LDAP', 1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/ldap config.w32
janiThu Aug 9 08:42:31 2007 UTC Modified files: /php-src/ext/ldap config.w32 Log: - Fixed bug #42247 (ldap_parse_result() not defined under win32) http://cvs.php.net/viewvc.cgi/php-src/ext/ldap/config.w32?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/ldap/config.w32 diff -u php-src/ext/ldap/config.w32:1.2 php-src/ext/ldap/config.w32:1.3 --- php-src/ext/ldap/config.w32:1.2 Sat Oct 23 23:03:52 2004 +++ php-src/ext/ldap/config.w32 Thu Aug 9 08:42:31 2007 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.2 2004/10/23 23:03:52 hholzgra Exp $ +// $Id: config.w32,v 1.3 2007/08/09 08:42:31 jani Exp $ // vim:ft=javascript ARG_WITH("ldap", "LDAP support", "no"); @@ -12,6 +12,7 @@ CHECK_LIB("olber32.lib", "ldap", PHP_LDAP)) { EXTENSION('ldap', 'ldap.c'); + AC_DEFINE('HAVE_LDAP_PARSE_RESULT', 1); AC_DEFINE('HAVE_LDAP_PARSE_REFERENCE', 1); AC_DEFINE('HAVE_LDAP_START_TLS_S', 1); AC_DEFINE('HAVE_LDAP', 1); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.ph
uw Thu Aug 9 08:41:13 2007 UTC Added files: /php-src/ext/mysqli/tests skipifconnectfailure.inc Modified files: /php-src/ext/mysqli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt 026.phpt 027.phpt 028.phpt 029.phpt 030.phpt 031.phpt 032.phpt 033.phpt 034.phpt 035.phpt 036.phpt 037.phpt 038.phpt 039.phpt 040.phpt 041.phpt 042.phpt 043.phpt 044.phpt 045.phpt 046.phpt 047.phpt 048.phpt 049.phpt 050.phpt 051.phpt 052.phpt 053.phpt 054.phpt 055.phpt 056.phpt 057.phpt 058.phpt 059.phpt 060.phpt 061.phpt 062.phpt 063.phpt 064.phpt 065.phpt 066.phpt 067.phpt 069.phpt 070.phpt 071.phpt 072.phpt 074.phpt Log: Introducing new environment variable: MYSQL_TEST_SKIP_CONNECT_FAILURE = false Every test that needs a working MySQL connection now includes skipifconnectfailure.inc. If MYSQL_TEST_SKIP_CONNECT_FAILURE evaluates to true skipifconnectfailure.inc tries to establish a database connection. If no connection can be opened, the test will be skipped. In case of MYSQL_TEST_SKIP_CONNECT_FAILURE = false (default) an no connection, a test who cannot establish a connection will fail. So, if you have a buggy configuration or a server that is sometimes not available, you can now decide if you want the tests to ignore this and skip the test or to fail (MYSQL_TEST_CONNECT_FAILURE = false, default). Other, minor tweaks: 042.phpt - whitespace 067.phpt - parse error in SKIPIF section fixed http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/001.phpt?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqli/tests/001.phpt diff -u php-src/ext/mysqli/tests/001.phpt:1.9 php-src/ext/mysqli/tests/001.phpt:1.10 --- php-src/ext/mysqli/tests/001.phpt:1.9 Mon Jul 23 12:04:19 2007 +++ php-src/ext/mysqli/tests/001.phpt Thu Aug 9 08:41:11 2007 @@ -1,8 +1,11 @@ --TEST-- mysqli connect --SKIPIF-- - - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/002.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/002.phpt diff -u php-src/ext/mysqli/tests/002.phpt:1.8 php-src/ext/mysqli/tests/002.phpt:1.9 --- php-src/ext/mysqli/tests/002.phpt:1.8 Mon Jul 23 12:04:19 2007 +++ php-src/ext/mysqli/tests/002.phpt Thu Aug 9 08:41:11 2007 @@ -1,7 +1,10 @@ --TEST-- mysqli bind_result 1 --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/003.phpt?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/mysqli/tests/003.phpt diff -u php-src/ext/mysqli/tests/003.phpt:1.8 php-src/ext/mysqli/tests/003.phpt:1.9 --- php-src/ext/mysqli/tests/003.phpt:1.8 Thu Jul 12 20:34:50 2007 +++ php-src/ext/mysqli/tests/003.phpt Thu Aug 9 08:41:11 2007 @@ -1,7 +1,10 @@ --TEST-- mysqli connect --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/004.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/mysqli/tests/004.phpt diff -u php-src/ext/mysqli/tests/004.phpt:1.7 php-src/ext/mysqli/tests/004.phpt:1.8 --- php-src/ext/mysqli/tests/004.phpt:1.7 Thu Jul 12 20:34:50 2007 +++ php-src/ext/mysqli/tests/004.phpt Thu Aug 9 08:41:11 2007 @@ -1,7 +1,10 @@ --TEST-- mysqli fetch char/text --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/005.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/005.phpt diff -u php-src/ext/mysqli/tests/005.phpt:1.6 php-src/ext/mysqli/tests/005.phpt:1.7 --- php-src/ext/mysqli/tests/005.phpt:1.6 Thu Jul 12 20:38:26 2007 +++ php-src/ext/mysqli/tests/005.phpt Thu Aug 9 08:41:12 2007 @@ -1,7 +1,10 @@ --TEST-- mysqli fetch char/text long --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/006.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/006.phpt diff -u php-src/ext/mysqli/tests/006.phpt:1.6 php-src/ext/mysqli/tests/006.phpt:1.7 --- php-src/ext/mysqli/tests/006.phpt:1.6 Thu Jul 12 20:38:26 2007 +++ php-src/ext/mysqli/tests/006.phpt Thu Aug 9 08:41:12 2007 @@ -1,7 +1,10 @@ --TEST-- mysqli fetch long values --SKIPIF-- - + --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/tests/007.phpt?r1=1.6&r2=1.7&diff_format=u Index: php-src/ext/mysqli/tests/007.phpt diff -u php-src/ex