Re: cvs: php4 /ext/standard file.c /ext/standard/tests/strings strtoupper.phpt

Hm again a problem with the server: it mixed up two commits. the ext/standard/file.c commit is from me. Commit message was: fix compiler warning?: implement default mentioned by manual marcus At 21:17 24.10.2002, Melvyn Sopacua wrote:

msopacua                Thu Oct 24 15:17:09 2002 EDT

Modified files:

    /php4/ext/standard  file.c
    /php4/ext/standard/tests/strings    strtoupper.phpt

Log: - Add locale string for FreeBSD ATTN: Test nog longer skips, but fails. So whatever has changed since 4.2.3 affects BSD systems. Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.275 php4/ext/standard/file.c:1.276

--- php4/ext/standard/file.c:1.275      Tue Oct 22 14:07:11 2002
+++ php4/ext/standard/file.c    Thu Oct 24 15:17:08 2002

@@ -21,7 +21,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: file.c,v 1.275 2002/10/22 18:07:11 iliaa Exp $ */ +/* $Id: file.c,v 1.276 2002/10/24 19:17:08 helly Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1310,7 +1310,7 @@ PHPAPI PHP_FUNCTION(fgets) {

        zval **arg1, **arg2;
-       int len;
+       int len = 1024;
        char *buf = NULL;
        int argc = ZEND_NUM_ARGS();
        size_t line_len = 0;

Index: php4/ext/standard/tests/strings/strtoupper.phpt diff -u php4/ext/standard/tests/strings/strtoupper.phpt:1.3 php4/ext/standard/tests/strings/strtoupper.phpt:1.4 --- php4/ext/standard/tests/strings/strtoupper.phpt:1.3 Wed Oct 23 20:49:38 2002

+++ php4/ext/standard/tests/strings/strtoupper.phpt     Thu Oct 24 15:17:09 2002

@@ -2,7 +2,7 @@ Test strtoupper on non-ASCII characters --SKIPIF-- <?php -if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge")) { +if (!setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1")) {

         die("skip locale needed for this test is not supported on this platform");

} ?> @@ -13,7 +13,7 @@ // this one. A small array based on PHP_OS should // cover a majority of systems and makes the problem // of locales transparent for the end user. -setlocale(LC_CTYPE, "de_DE", "de", "german", "ge"); +setlocale(LC_CTYPE, "de_DE", "de", "german", "ge", "de_DE.ISO8859-1"); echo strtoupper($chars)."\n"; ?> --EXPECT-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php