Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

# By Dmitry Panin (1) and Remi Collet (1)
# Via Nikita Popov
* 'PHP-5.4' of git.php.net:php-src:
  Fix HTML entity table generation
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.

ext/openssl/tests/openssl.cnf

@@ -3,6 +3,7 @@ default_bits		= 1024
 default_keyfile 	= privkey.pem
 distinguished_name	= req_distinguished_name
 attributes		= req_attributes
+default_md		= sha1
 x509_extensions	= v3_ca	# The extensions to add to the self signed cert
 string_mask = MASK:4294967295
 

ext/standard/html_tables.h

@@ -1395,8 +1395,8 @@ static const entity_multicodepoint_row multi_cp_html5_02ACC[] = {
 	{ {0x0FE00,	"varsupsetneqq",      	13} },
 };
 static const entity_multicodepoint_row multi_cp_html5_02AFD[] = {
-	{ {01,		NULL                  ,	0} },
-	{ {0x0FE00,	"varsupsetneqq",      	13} },
+	{ {01,		"parsl",              	 5} },
+	{ {0x020E5,	"nparsl",             	 6} },
 };
 
 /* End of double code point tables }}} */

ext/standard/html_tables/html_table_gen.php

@@ -461,6 +461,7 @@ enum entity_charset charset;
 
 ksort($multicp_rows);
 foreach ($multicp_rows as &$v) { ksort($v); }
+unset($v);
 
 echo
 "/* {{{ Start of double code point tables for $name */", "\n\n";

ext/standard/tests/strings/get_html_translation_table_basic5.phpt

@@ -46,7 +46,7 @@ echo "Done\n";
 --EXPECT--
 *** Testing get_html_translation_table() : basic functionality/HTML 5 ***
 -- with table = HTML_ENTITIES, ENT_COMPAT --
-int(1509)
+int(1510)
 Array
 (
     [Æ] => Æ
@@ -1108,6 +1108,7 @@ Array
     [⋾] => ⋾
     [⋽] => ⋽
     [∦] => ∦
+    [⫽⃥] => &nparsl
     [∂̸] => &npart
     [⨔] => ⨔
     [⊀] => ⊀
@@ -1196,6 +1197,7 @@ Array
     [⌽] => ⌽
     [¶] => ¶
     [⫳] => ⫳
+    [⫽] => ⫽
     [∂] => ∂
     [п] => п
     [%] => %
@@ -1500,7 +1502,6 @@ Array
     [⦜] => ⦜
     [ϰ] => ϰ
     [⫌︀] => &varsupsetneqq
-    [⫽︀] => &varsupsetneqq
     [⊲] => ⊲
     [в] => в
     [⊢] => ⊢
@@ -1561,9 +1562,9 @@ Array
     [‌] => ‌
 )
 -- with table = HTML_ENTITIES, ENT_QUOTES --
-int(1510)
+int(1511)
 -- with table = HTML_ENTITIES, ENT_NOQUOTES --
-int(1508)
+int(1509)
 -- with table = HTML_SPECIALCHARS, ENT_COMPAT --
 int(4)
 Array

ext/standard/tests/strings/htmlentities_html5.phpt

@@ -1418,6 +1418,7 @@ foreach ($mpcent as $i) {
 ⫱	U+02AF1
 ⫲	U+02AF2
 ⫳	U+02AF3
+⫽	U+02AFD
 ff	U+0FB00
 fi	U+0FB01
 fl	U+0FB02
@@ -1620,4 +1621,4 @@ foreach ($mpcent as $i) {
 ⫆̸	U+02AC6 U+00338
 ⫋︀	U+02ACB U+0FE00
 ⫌︀	U+02ACC U+0FE00
-⫌︀	U+02AFD U+0FE00
+⫽︀	U+02AFD U+0FE00