MFB: fix #43927 (koi8r is missing from html_entity_decode())

patch by andy at demos dot su

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 7ddcd2daab8f2197c2b0667f42791d528d54b7f1..6e3e50ceb5803a8344e00a808a57e4ad9f55f97b 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -958,6 +958,7 @@ PHPAPI char *php_unescape_html_entities(char *orig, int oldlen, int *newlen, int
                                        case cs_cp1251:
                                        case cs_8859_5:
                                        case cs_cp866:
+                                       case cs_koi8r:
                                                replacement[0] = k;
                                                replacement[1] = '\0';
                                                replacement_len = 1;

diff --git a/ext/standard/tests/strings/bug43927.phpt b/ext/standard/tests/strings/bug43927.phpt
new file mode 100644 (file)
index 0000000..a2e8d05
--- /dev/null
+++ b/ext/standard/tests/strings/bug43927.phpt
@@ -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;"