mike		Tue Dec 12 19:25:48 2006 UTC

  Modified files:              
    /php-src	unicode-progress.txt 
    /php-src/ext/posix	CREDITS 
    /php-src/ext/standard	credits.c credits_ext.h info.c info.h 
  Log:
  - utf8 CREDITS and php_info API
  - unicode progress in info.c
  
  
http://cvs.php.net/viewvc.cgi/php-src/unicode-progress.txt?r1=1.65&r2=1.66&diff_format=u
Index: php-src/unicode-progress.txt
diff -u php-src/unicode-progress.txt:1.65 php-src/unicode-progress.txt:1.66
--- php-src/unicode-progress.txt:1.65	Tue Dec 12 18:28:31 2006
+++ php-src/unicode-progress.txt	Tue Dec 12 19:25:47 2006
@@ -568,6 +568,18 @@
     array_intersect_uassoc(), array_uintersect_uassoc()
     array_intersect_key(), array_intersect_ukey()
 
+  info.c
+  ------
+    phpinfo()
+    phpversion()
+    phpcredits()
+    php_logo_guid()
+    php_real_logo_guid()
+    php_egg_logo_guid()
+    zend_logo_guid()
+    php_sapi_name()
+    php_uname()
+    php_ini_scanned_files()
 
   string.c
   --------
http://cvs.php.net/viewvc.cgi/php-src/ext/posix/CREDITS?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/posix/CREDITS
diff -u php-src/ext/posix/CREDITS:1.1 php-src/ext/posix/CREDITS:1.2
--- php-src/ext/posix/CREDITS:1.1	Mon Nov 20 10:31:31 2000
+++ php-src/ext/posix/CREDITS	Tue Dec 12 19:25:47 2006
@@ -1,2 +1,2 @@
 Posix
-Kristian K�hntopp
+Kristian Köhntopp
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits.c?r1=1.42&r2=1.43&diff_format=u
Index: php-src/ext/standard/credits.c
diff -u php-src/ext/standard/credits.c:1.42 php-src/ext/standard/credits.c:1.43
--- php-src/ext/standard/credits.c:1.42	Sun Dec 10 15:02:50 2006
+++ php-src/ext/standard/credits.c	Tue Dec 12 19:25:47 2006
@@ -17,14 +17,16 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: credits.c,v 1.42 2006/12/10 15:02:50 mike Exp $ */
+/* $Id: credits.c,v 1.43 2006/12/12 19:25:47 mike Exp $ */
 
 #include "php.h"
 #include "info.h"
 #include "SAPI.h"
 
+/* NOTE: keep utf8 */
+
 #define CREDIT_LINE(module, authors) php_info_print_table_row(2, module, authors)
-#define CREDIT_PUTS(s) php_output_write_western((s), strlen(s) TSRMLS_CC)
+#define CREDIT_PUTS(s) php_output_write_utf8((s), strlen(s) TSRMLS_CC)
 
 /* {{{ php_print_credits
  */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.39&r2=1.40&diff_format
=u
Index: php-src/ext/standard/credits_ext.h
diff -u php-src/ext/standard/credits_ext.h:1.39 php-src/ext/standard/credits_ext.h:1.40
--- php-src/ext/standard/credits_ext.h:1.39	Wed Oct  4 12:53:03 2006
+++ php-src/ext/standard/credits_ext.h	Tue Dec 12 19:25:47 2006
@@ -57,7 +57,7 @@
 CREDIT_LINE("Perl Compatible Regexps", "Andrei Zmievski");
 CREDIT_LINE("PHP Data Objects", "Wez Furlong, Marcus Boerger, Sterling Hughes, George Schlo
ssnagle, Ilia Alshanetsky");
 CREDIT_LINE("PHP hash", "Sara Golemon, Rasmus Lerdorf, Stefan Esser, Michael Wallner");
-CREDIT_LINE("Posix", "Kristian K�hntopp");
+CREDIT_LINE("Posix", "Kristian Köhntopp");
 CREDIT_LINE("PostgreSQL driver for PDO", "Edin Kadribasic, Ilia Alshanetsky");
 CREDIT_LINE("PostgreSQL", "Jouni Ahto, Zeev Suraski, Yasuo Ohgaki, Chris Kings-Lynne");
 CREDIT_LINE("Pspell", "Vlad Krupin");
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.272&r2=1.273&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.272 php-src/ext/standard/info.c:1.273
--- php-src/ext/standard/info.c:1.272	Sun Dec 10 15:02:50 2006
+++ php-src/ext/standard/info.c	Tue Dec 12 19:25:47 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: info.c,v 1.272 2006/12/10 15:02:50 mike Exp $ */
+/* $Id: info.c,v 1.273 2006/12/12 19:25:47 mike Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -67,8 +67,8 @@
 	char *new_str;
 	TSRMLS_FETCH();
 	
-	new_str = php_escape_html_entities((char *) str, len, &new_len, 0, ENT_QUOTES, "iso-8859-1
" TSRMLS_CC);
-	written = php_output_write_western(new_str, new_len TSRMLS_CC);
+	new_str = php_escape_html_entities((char *) str, len, &new_len, 0, ENT_QUOTES, "utf8" TSRM
LS_CC);
+	written = php_output_write_utf8(new_str, new_len TSRMLS_CC);
 	efree(new_str);
 	return written;
 }
@@ -76,17 +76,15 @@
 static int php_info_uprint_html_esc(const UChar *str, int len)
 {
 	UErrorCode status = U_ZERO_ERROR;
-	char *new_str = NULL, *esc_str;
-	int new_len, esc_len, written;
+	char *new_str = NULL;
+	int new_len, written;
 	TSRMLS_FETCH();
 	
 	zend_unicode_to_string_ex(UG(utf8_conv), &new_str, &new_len, str, len, &status);
 	if (U_FAILURE(status)) {
 		return 0;
 	}
-	
-	esc_str = php_escape_html_entities(new_str, new_len, &esc_len, 0, ENT_QUOTES, "utf8" TSRML
S_CC);
-	written = php_output_write_utf8(esc_str, esc_len TSRMLS_CC);
+	written = php_info_print_html_esc(new_str, new_len);
 	efree(new_str);
 	return written;
 }
@@ -102,7 +100,7 @@
 	len = vspprintf(&buf, 0, fmt, argv);
 	va_end(argv);
 	
-	written = php_output_write_western(buf, len TSRMLS_CC);
+	written = php_output_write_utf8(buf, len TSRMLS_CC);
 	efree(buf);
 	return written;
 }
@@ -118,7 +116,7 @@
 static int php_info_print(const char *str)
 {
 	TSRMLS_FETCH();
-	return php_output_write_western(str, strlen(str) TSRMLS_CC);
+	return php_output_write_utf8(str, strlen(str) TSRMLS_CC);
 }
 
 static int php_info_uprint(const UChar *str, int len)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.h?r1=1.40&r2=1.41&diff_format=u
Index: php-src/ext/standard/info.h
diff -u php-src/ext/standard/info.h:1.40 php-src/ext/standard/info.h:1.41
--- php-src/ext/standard/info.h:1.40	Fri Sep 29 21:40:35 2006
+++ php-src/ext/standard/info.h	Tue Dec 12 19:25:47 2006
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: info.h,v 1.40 2006/09/29 21:40:35 iliaa Exp $ */
+/* $Id: info.h,v 1.41 2006/12/12 19:25:47 mike Exp $ */
 
 #ifndef INFO_H
 #define INFO_H
@@ -66,6 +66,7 @@
 PHP_FUNCTION(php_sapi_name);
 PHP_FUNCTION(php_uname);
 PHP_FUNCTION(php_ini_scanned_files);
+/* NOTE: use UTF-8 if you print anything non-ASCII */
 PHPAPI char *php_info_html_esc(char *string TSRMLS_DC);
 PHPAPI void php_print_info_htmlhead(TSRMLS_D);
 PHPAPI void php_print_info(int flag TSRMLS_DC);

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