[PHP-CVS] cvs: php-src /ext/standard html.c /ext/standard/tests/strings bug43927.phpt

[Antony Dovgal]

tony2001                Mon Jan 28 23:08:07 2008 UTC

  Modified files:              
    /php-src/ext/standard       html.c 
    /php-src/ext/standard/tests/strings bug43927.phpt 
  Log:
  MFB: fix #43927 (koi8r is missing from html_entity_decode())
  patch by andy at demos dot su
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.130&r2=1.131&diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.130 php-src/ext/standard/html.c:1.131
--- php-src/ext/standard/html.c:1.130   Fri Jan 25 18:11:19 2008
+++ php-src/ext/standard/html.c Mon Jan 28 23:08:07 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: html.c,v 1.130 2008/01/25 18:11:19 scottmac Exp $ */
+/* $Id: html.c,v 1.131 2008/01/28 23:08:07 tony2001 Exp $ */
 
 /*
  * HTML entity resources:
@@ -958,6 +958,7 @@
                                        case cs_cp1251:
                                        case cs_8859_5:
                                        case cs_cp866:
+                                       case cs_koi8r:
                                                replacement[0] = k;
                                                replacement[1] = '\0';
                                                replacement_len = 1;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug43927.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/strings/bug43927.phpt
diff -u /dev/null php-src/ext/standard/tests/strings/bug43927.phpt:1.2
--- /dev/null   Mon Jan 28 23:08:07 2008
+++ php-src/ext/standard/tests/strings/bug43927.phpt    Mon Jan 28 23:08:07 2008
@@ -0,0 +1,16 @@
+--TEST--
+Bug #43927 (koi8r is missing from html_entity_decode())
+--FILE--
+<?php
+var_dump(html_entity_decode("&amp;lt;", ENT_COMPAT, 'koi8-r'));
+var_dump(html_entity_decode("&amp;#38;", ENT_COMPAT, 'koi8-r'));
+var_dump(html_entity_decode("&amp;#38;lt;", ENT_COMPAT, 'koi8-r'));
+?>
+--EXPECT--
+string(4) "&lt;"
+string(5) "&#38;"
+string(8) "&#38;lt;"
+--UEXPECT--
+unicode(4) "&lt;"
+unicode(5) "&#38;"
+unicode(8) "&#38;lt;"

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