--- embedaddon/php/ext/standard/html.h	2012/02/21 23:48:02	1.1.1.1
+++ embedaddon/php/ext/standard/html.h	2012/05/29 12:34:43	1.1.1.2
@@ -16,21 +16,36 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: html.h,v 1.1.1.1 2012/02/21 23:48:02 misho Exp $ */
+/* $Id: html.h,v 1.1.1.2 2012/05/29 12:34:43 misho Exp $ */
 
 #ifndef HTML_H
 #define HTML_H
 
-#define ENT_HTML_QUOTE_NONE		0
-#define ENT_HTML_QUOTE_SINGLE	1
-#define ENT_HTML_QUOTE_DOUBLE	2
-#define ENT_HTML_IGNORE_ERRORS	4
+#define ENT_HTML_QUOTE_NONE			0
+#define ENT_HTML_QUOTE_SINGLE		1
+#define ENT_HTML_QUOTE_DOUBLE		2
+#define ENT_HTML_IGNORE_ERRORS		4
+#define ENT_HTML_SUBSTITUTE_ERRORS	8
+#define ENT_HTML_DOC_TYPE_MASK		(16|32)
+#define ENT_HTML_DOC_HTML401		0
+#define ENT_HTML_DOC_XML1			16
+#define ENT_HTML_DOC_XHTML			32
+#define ENT_HTML_DOC_HTML5			(16|32)
+/* reserve bit 6 */
+#define ENT_HTML_SUBSTITUTE_DISALLOWED_CHARS	128
 
-#define ENT_COMPAT    ENT_HTML_QUOTE_DOUBLE
-#define ENT_QUOTES    (ENT_HTML_QUOTE_DOUBLE | ENT_HTML_QUOTE_SINGLE)
-#define ENT_NOQUOTES  ENT_HTML_QUOTE_NONE
-#define ENT_IGNORE    ENT_HTML_IGNORE_ERRORS
 
+#define ENT_COMPAT		ENT_HTML_QUOTE_DOUBLE
+#define ENT_QUOTES		(ENT_HTML_QUOTE_DOUBLE | ENT_HTML_QUOTE_SINGLE)
+#define ENT_NOQUOTES	ENT_HTML_QUOTE_NONE
+#define ENT_IGNORE		ENT_HTML_IGNORE_ERRORS
+#define ENT_SUBSTITUTE	ENT_HTML_SUBSTITUTE_ERRORS
+#define ENT_HTML401		0
+#define ENT_XML1		16
+#define ENT_XHTML		32
+#define ENT_HTML5		(16|32)
+#define ENT_DISALLOWED	128
+
 void register_html_constants(INIT_FUNC_ARGS);
 
 PHP_FUNCTION(htmlspecialchars);
@@ -39,8 +54,9 @@ PHP_FUNCTION(htmlspecialchars_decode);
 PHP_FUNCTION(html_entity_decode);
 PHP_FUNCTION(get_html_translation_table);
 
-PHPAPI char *php_escape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC);
-PHPAPI char *php_escape_html_entities_ex(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset, zend_bool double_encode TSRMLS_DC);
-PHPAPI char *php_unescape_html_entities(unsigned char *old, int oldlen, int *newlen, int all, int quote_style, char *hint_charset TSRMLS_DC);
+PHPAPI char *php_escape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+PHPAPI char *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset, zend_bool double_encode TSRMLS_DC);
+PHPAPI char *php_unescape_html_entities(unsigned char *old, size_t oldlen, size_t *newlen, int all, int flags, char *hint_charset TSRMLS_DC);
+PHPAPI unsigned int php_next_utf8_char(const unsigned char *str, size_t str_len, size_t *cursor, int *status);
 
 #endif /* HTML_H */