Re: cvs: php4 /ext/standard info.c

Why did you remove the charset info? I want my charset back since it enables correct handling of the output. Everything these lines commented out by you do is telling the receiver what charset he gets. That is compareable to http charset info which will be generated by those modules also. This way you can enable mbsting or iconv with any charset you like. This has nothing to do with the other thing you did in this patch: changing behaviour of php_escape_html_entities(). I guess you did not understand what you removed? marcus At 16:39 09.10.2002, Colin Viebrock wrote:

cmv             Wed Oct  9 10:39:40 2002 EDT

Modified files:

    /php4/ext/standard  info.c

Log: no charsets, only basic entity escaping Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.214 php4/ext/standard/info.c:1.215

--- php4/ext/standard/info.c:1.214      Sun Oct  6 13:04:10 2002
+++ php4/ext/standard/info.c    Wed Oct  9 10:39:39 2002

@@ -18,7 +18,7 @@

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

*/ -/* $Id: info.c,v 1.214 2002/10/06 17:04:10 rasmus Exp $ */ +/* $Id: info.c,v 1.215 2002/10/09 14:39:39 cmv Exp $ */ #include "php.h" #include "php_ini.h" @@ -191,7 +191,7 @@ PHPAPI char *php_info_html_esc(char *string TSRMLS_DC) {

        int new_len;
-       return php_escape_html_entities(string, strlen(string), &new_len, 1, ENT_COMPAT, NULL TSRMLS_CC);
+       return php_escape_html_entities(string, strlen(string), &new_len, 0, ENT_NOQUOTES, NULL TSRMLS_CC);

} /* }}} */ @@ -277,6 +277,9 @@ */ PHPAPI void php_print_info_htmlhead(TSRMLS_D) { + +/*** none of this is needed now *** +

        const char *charset = NULL;

        if (SG(default_charset)) {

@@ -303,12 +306,17 @@

                charset = "US-ASCII";
        }

+*** none of that is needed now ***/ + +

        PUTS("<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"DTD/xhtml1-transitional.dtd\">\n");
        PUTS("<html>");
        PUTS("<head>\n");
        php_info_print_style();
        PUTS("<title>phpinfo()</title>");

+/*

        php_printf("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", charset);

+*/

        PUTS("</head>\n");
        PUTS("<body><center>\n");

} -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php