Imported Upstream version 5.2.2upstream/5.2.2

4 files changed, 171 insertions, 126 deletions

diff --git a/ext/xmlwriter/php_xmlwriter.c b/ext/xmlwriter/php_xmlwriter.c
index 0daa00e4a..56a696801 100644
--- a/ext/xmlwriter/php_xmlwriter.c
+++ b/ext/xmlwriter/php_xmlwriter.c
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2006 The PHP Group                                |
+  | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_xmlwriter.c,v 1.20.2.12.2.5 2006/09/16 18:18:55 nlopess Exp $ */
+/* $Id: php_xmlwriter.c,v 1.20.2.12.2.12 2007/01/06 18:03:43 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,7 +29,59 @@
 #include "ext/standard/info.h"
 #include "php_xmlwriter.h"
 
-zend_class_entry *xmlwriter_class_entry;
+
+#if LIBXML_VERSION >= 20605
+static PHP_FUNCTION(xmlwriter_set_indent);
+static PHP_FUNCTION(xmlwriter_set_indent_string);
+#endif
+static PHP_FUNCTION(xmlwriter_start_attribute);
+static PHP_FUNCTION(xmlwriter_end_attribute);
+static PHP_FUNCTION(xmlwriter_write_attribute);
+#if LIBXML_VERSION > 20617
+static PHP_FUNCTION(xmlwriter_start_attribute_ns);
+static PHP_FUNCTION(xmlwriter_write_attribute_ns);
+#endif
+static PHP_FUNCTION(xmlwriter_start_element);
+static PHP_FUNCTION(xmlwriter_end_element);
+static PHP_FUNCTION(xmlwriter_full_end_element);
+static PHP_FUNCTION(xmlwriter_start_element_ns);
+static PHP_FUNCTION(xmlwriter_write_element);
+static PHP_FUNCTION(xmlwriter_write_element_ns);
+static PHP_FUNCTION(xmlwriter_start_pi);
+static PHP_FUNCTION(xmlwriter_end_pi);
+static PHP_FUNCTION(xmlwriter_write_pi);
+static PHP_FUNCTION(xmlwriter_start_cdata);
+static PHP_FUNCTION(xmlwriter_end_cdata);
+static PHP_FUNCTION(xmlwriter_write_cdata);
+static PHP_FUNCTION(xmlwriter_text);
+static PHP_FUNCTION(xmlwriter_write_raw);
+static PHP_FUNCTION(xmlwriter_start_document);
+static PHP_FUNCTION(xmlwriter_end_document);
+#if LIBXML_VERSION >= 20607
+static PHP_FUNCTION(xmlwriter_start_comment);
+static PHP_FUNCTION(xmlwriter_end_comment);
+#endif
+static PHP_FUNCTION(xmlwriter_write_comment);
+static PHP_FUNCTION(xmlwriter_start_dtd);
+static PHP_FUNCTION(xmlwriter_end_dtd);
+static PHP_FUNCTION(xmlwriter_write_dtd);
+static PHP_FUNCTION(xmlwriter_start_dtd_element);
+static PHP_FUNCTION(xmlwriter_end_dtd_element);
+static PHP_FUNCTION(xmlwriter_write_dtd_element);
+#if LIBXML_VERSION > 20608
+static PHP_FUNCTION(xmlwriter_start_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_end_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_write_dtd_attlist);
+static PHP_FUNCTION(xmlwriter_start_dtd_entity);
+static PHP_FUNCTION(xmlwriter_end_dtd_entity);
+static PHP_FUNCTION(xmlwriter_write_dtd_entity);
+#endif
+static PHP_FUNCTION(xmlwriter_open_uri);
+static PHP_FUNCTION(xmlwriter_open_memory);
+static PHP_FUNCTION(xmlwriter_output_memory);
+static PHP_FUNCTION(xmlwriter_flush);
+
+static zend_class_entry *xmlwriter_class_entry_ce;
 
 static void xmlwriter_free_resource_ptr(xmlwriter_object *intern TSRMLS_DC);
 static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC);
@@ -88,7 +140,7 @@ static void xmlwriter_object_free_storage(void *object TSRMLS_DC)
 
 
 /* {{{ xmlwriter_object_new */
-PHP_XMLWRITER_API zend_object_value xmlwriter_object_new(zend_class_entry *class_type TSRMLS_DC)
+static zend_object_value xmlwriter_object_new(zend_class_entry *class_type TSRMLS_DC)
 {
 	ze_xmlwriter_object *intern;
 	zval *tmp;
@@ -166,6 +218,9 @@ static zend_function_entry xmlwriter_functions[] = {
 	PHP_FE(xmlwriter_start_dtd_attlist,	NULL)
 	PHP_FE(xmlwriter_end_dtd_attlist,	NULL)
 	PHP_FE(xmlwriter_write_dtd_attlist,	NULL)
+	PHP_FE(xmlwriter_start_dtd_entity,	NULL)
+	PHP_FE(xmlwriter_end_dtd_entity,	NULL)
+	PHP_FE(xmlwriter_write_dtd_entity,	NULL)
 #endif
 	PHP_FE(xmlwriter_output_memory,		NULL)
 	PHP_FE(xmlwriter_flush,				NULL)
@@ -220,6 +275,9 @@ static zend_function_entry xmlwriter_class_functions[] = {
 	PHP_ME_MAPPING(startDtdAttlist,	xmlwriter_start_dtd_attlist,	NULL, 0)
 	PHP_ME_MAPPING(endDtdAttlist,	xmlwriter_end_dtd_attlist,	NULL, 0)
 	PHP_ME_MAPPING(writeDtdAttlist,	xmlwriter_write_dtd_attlist,	NULL, 0)
+	PHP_ME_MAPPING(startDtdEntity,	xmlwriter_start_dtd_entity,	NULL, 0)
+	PHP_ME_MAPPING(endDtdEntity,	xmlwriter_end_dtd_entity,	NULL, 0)
+	PHP_ME_MAPPING(writeDtdEntity,	xmlwriter_write_dtd_entity,	NULL, 0)
 #endif
 	PHP_ME_MAPPING(outputMemory,	xmlwriter_output_memory,	NULL, 0)
 	PHP_ME_MAPPING(flush,			xmlwriter_flush,			NULL, 0)
@@ -229,9 +287,9 @@ static zend_function_entry xmlwriter_class_functions[] = {
 #endif
 
 /* {{{ function prototypes */
-PHP_MINIT_FUNCTION(xmlwriter);
-PHP_MSHUTDOWN_FUNCTION(xmlwriter);
-PHP_MINFO_FUNCTION(xmlwriter);
+static PHP_MINIT_FUNCTION(xmlwriter);
+static PHP_MSHUTDOWN_FUNCTION(xmlwriter);
+static PHP_MINFO_FUNCTION(xmlwriter);
 
 static int le_xmlwriter;
 /* }}} */
@@ -239,7 +297,7 @@ static int le_xmlwriter;
 /* _xmlwriter_get_valid_file_path should be made a 
 	common function in libxml extension as code is common to a few xml extensions */
 /* {{{ _xmlwriter_get_valid_file_path */
-char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
+static char *_xmlwriter_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len  TSRMLS_DC) {
 	xmlURI *uri;
 	xmlChar *escsource;
 	char *file_dest;
@@ -301,15 +359,15 @@ static void *php_xmlwriter_streams_IO_open_write_wrapper(const char *filename TS
 /* }}} */
 
 /* {{{ php_xmlwriter_streams_IO_write */
-int php_xmlwriter_streams_IO_write(void *context, const char *buffer, int len)
+static int php_xmlwriter_streams_IO_write(void *context, const char *buffer, int len)
 {
 	TSRMLS_FETCH();
 	return php_stream_write((php_stream*)context, buffer, len);
 }
 /* }}} */
 
-/* {{{ xmlwriter_objects_clone */
-int php_xmlwriter_streams_IO_close(void *context)
+/* {{{ php_xmlwriter_streams_IO_close */
+static int php_xmlwriter_streams_IO_close(void *context)
 {
 	TSRMLS_FETCH();
 	return php_stream_close((php_stream*)context);
@@ -337,12 +395,12 @@ zend_module_entry xmlwriter_module_entry = {
 ZEND_GET_MODULE(xmlwriter)
 #endif
 
-/* {{{ xmlwriter_objects_clone */
-void xmlwriter_objects_clone(void *object, void **object_clone TSRMLS_DC)
+/* {{{ xmlwriter_objects_clone 
+static void xmlwriter_objects_clone(void *object, void **object_clone TSRMLS_DC)
 {
-	/* TODO */
+	TODO
 }
-/* }}} */
+}}} */
 
 /* {{{ xmlwriter_dtor */
 static void xmlwriter_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
@@ -430,7 +488,7 @@ static void php_xmlwriter_end(INTERNAL_FUNCTION_PARAMETERS, xmlwriter_read_int_t
 #if LIBXML_VERSION >= 20605
 /* {{{ proto bool xmlwriter_set_indent(resource xmlwriter, bool indent)
 Toggle indentation on/off - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_set_indent)
+static PHP_FUNCTION(xmlwriter_set_indent)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -470,7 +528,7 @@ PHP_FUNCTION(xmlwriter_set_indent)
 
 /* {{{ proto bool xmlwriter_set_indent_string(resource xmlwriter, string indentString)
 Set string used for indenting - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_set_indent_string)
+static PHP_FUNCTION(xmlwriter_set_indent_string)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterSetIndentString, NULL);
 }
@@ -480,7 +538,7 @@ PHP_FUNCTION(xmlwriter_set_indent_string)
 
 /* {{{ proto bool xmlwriter_start_attribute(resource xmlwriter, string name)
 Create start attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_attribute)
+static PHP_FUNCTION(xmlwriter_start_attribute)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartAttribute, "Invalid Attribute Name");
 }
@@ -488,7 +546,7 @@ PHP_FUNCTION(xmlwriter_start_attribute)
 
 /* {{{ proto bool xmlwriter_end_attribute(resource xmlwriter)
 End attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_attribute)
+static PHP_FUNCTION(xmlwriter_end_attribute)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndAttribute);
 }
@@ -497,7 +555,7 @@ PHP_FUNCTION(xmlwriter_end_attribute)
 #if LIBXML_VERSION > 20617
 /* {{{ proto bool xmlwriter_start_attribute_ns(resource xmlwriter, string prefix, string name, string uri)
 Create start namespaced attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_attribute_ns)
+static PHP_FUNCTION(xmlwriter_start_attribute_ns)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -541,7 +599,7 @@ PHP_FUNCTION(xmlwriter_start_attribute_ns)
 
 /* {{{ proto bool xmlwriter_write_attribute(resource xmlwriter, string name, string content)
 Write full attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_attribute)
+static PHP_FUNCTION(xmlwriter_write_attribute)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -586,7 +644,7 @@ PHP_FUNCTION(xmlwriter_write_attribute)
 #if LIBXML_VERSION > 20617
 /* {{{ proto bool xmlwriter_write_attribute_ns(resource xmlwriter, string prefix, string name, string uri, string content)
 Write full namespaced attribute - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_attribute_ns)
+static PHP_FUNCTION(xmlwriter_write_attribute_ns)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -631,7 +689,7 @@ PHP_FUNCTION(xmlwriter_write_attribute_ns)
 
 /* {{{ proto bool xmlwriter_start_element(resource xmlwriter, string name)
 Create start element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_element)
+static PHP_FUNCTION(xmlwriter_start_element)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartElement, "Invalid Element Name");
 }
@@ -640,7 +698,7 @@ PHP_FUNCTION(xmlwriter_start_element)
 
 /* {{{ proto bool xmlwriter_start_element_ns(resource xmlwriter, string prefix, string name, string uri)
 Create start namespaced element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_element_ns)
+static PHP_FUNCTION(xmlwriter_start_element_ns)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -684,7 +742,7 @@ PHP_FUNCTION(xmlwriter_start_element_ns)
 
 /* {{{ proto bool xmlwriter_end_element(resource xmlwriter)
 End current element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_element)
+static PHP_FUNCTION(xmlwriter_end_element)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndElement);
 }
@@ -692,7 +750,7 @@ PHP_FUNCTION(xmlwriter_end_element)
 
 /* {{{ proto bool xmlwriter_full_end_element(resource xmlwriter)
 End current element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_full_end_element)
+static PHP_FUNCTION(xmlwriter_full_end_element)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterFullEndElement);
 }
@@ -700,7 +758,7 @@ PHP_FUNCTION(xmlwriter_full_end_element)
 
 /* {{{ proto bool xmlwriter_write_element(resource xmlwriter, string name, string content)
 Write full element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_element)
+static PHP_FUNCTION(xmlwriter_write_element)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -743,7 +801,7 @@ PHP_FUNCTION(xmlwriter_write_element)
 
 /* {{{ proto bool xmlwriter_write_element_ns(resource xmlwriter, string prefix, string name, string uri, string content)
 Write full namesapced element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_element_ns)
+static PHP_FUNCTION(xmlwriter_write_element_ns)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -787,7 +845,7 @@ PHP_FUNCTION(xmlwriter_write_element_ns)
 
 /* {{{ proto bool xmlwriter_start_pi(resource xmlwriter, string target)
 Create start PI tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_pi)
+static PHP_FUNCTION(xmlwriter_start_pi)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartPI, "Invalid PI Target");
 }
@@ -795,7 +853,7 @@ PHP_FUNCTION(xmlwriter_start_pi)
 
 /* {{{ proto bool xmlwriter_end_pi(resource xmlwriter)
 End current PI - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_pi)
+static PHP_FUNCTION(xmlwriter_end_pi)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndPI);
 }
@@ -803,7 +861,7 @@ PHP_FUNCTION(xmlwriter_end_pi)
 
 /* {{{ proto bool xmlwriter_write_pi(resource xmlwriter, string target, string content)
 Write full PI tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_pi)
+static PHP_FUNCTION(xmlwriter_write_pi)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -847,7 +905,7 @@ PHP_FUNCTION(xmlwriter_write_pi)
 
 /* {{{ proto bool xmlwriter_start_cdata(resource xmlwriter)
 Create start CDATA tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_cdata)
+static PHP_FUNCTION(xmlwriter_start_cdata)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -882,7 +940,7 @@ PHP_FUNCTION(xmlwriter_start_cdata)
 
 /* {{{ proto bool xmlwriter_end_cdata(resource xmlwriter)
 End current CDATA - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_cdata)
+static PHP_FUNCTION(xmlwriter_end_cdata)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndCDATA);
 }
@@ -890,7 +948,7 @@ PHP_FUNCTION(xmlwriter_end_cdata)
 
 /* {{{ proto bool xmlwriter_write_cdata(resource xmlwriter, string content)
 Write full CDATA tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_cdata)
+static PHP_FUNCTION(xmlwriter_write_cdata)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteCDATA, NULL);
 }
@@ -898,7 +956,7 @@ PHP_FUNCTION(xmlwriter_write_cdata)
 
 /* {{{ proto bool xmlwriter_write_raw(resource xmlwriter, string content)
 Write text - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_raw)
+static PHP_FUNCTION(xmlwriter_write_raw)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteRaw, NULL);
 }
@@ -906,7 +964,7 @@ PHP_FUNCTION(xmlwriter_write_raw)
 
 /* {{{ proto bool xmlwriter_text(resource xmlwriter, string content)
 Write text - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_text)
+static PHP_FUNCTION(xmlwriter_text)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteString, NULL);
 }
@@ -915,7 +973,7 @@ PHP_FUNCTION(xmlwriter_text)
 #if LIBXML_VERSION >= 20607
 /* {{{ proto bool xmlwriter_start_comment(resource xmlwriter)
 Create start comment - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_comment)
+static PHP_FUNCTION(xmlwriter_start_comment)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -950,7 +1008,7 @@ PHP_FUNCTION(xmlwriter_start_comment)
 
 /* {{{ proto bool xmlwriter_end_comment(resource xmlwriter)
 Create end comment - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_comment)
+static PHP_FUNCTION(xmlwriter_end_comment)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndComment);
 }
@@ -960,7 +1018,7 @@ PHP_FUNCTION(xmlwriter_end_comment)
 
 /* {{{ proto bool xmlwriter_write_comment(resource xmlwriter, string content)
 Write full comment tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_comment)
+static PHP_FUNCTION(xmlwriter_write_comment)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterWriteComment, NULL);
 }
@@ -968,7 +1026,7 @@ PHP_FUNCTION(xmlwriter_write_comment)
 
 /* {{{ proto bool xmlwriter_start_document(resource xmlwriter, string version, string encoding, string standalone)
 Create document tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_document)
+static PHP_FUNCTION(xmlwriter_start_document)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1008,7 +1066,7 @@ PHP_FUNCTION(xmlwriter_start_document)
 
 /* {{{ proto bool xmlwriter_end_document(resource xmlwriter)
 End current document - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_document)
+static PHP_FUNCTION(xmlwriter_end_document)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDocument);
 }
@@ -1016,7 +1074,7 @@ PHP_FUNCTION(xmlwriter_end_document)
 
 /* {{{ proto bool xmlwriter_start_dtd(resource xmlwriter, string name, string pubid, string sysid)
 Create start DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd)
+static PHP_FUNCTION(xmlwriter_start_dtd)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1057,7 +1115,7 @@ PHP_FUNCTION(xmlwriter_start_dtd)
 
 /* {{{ proto bool xmlwriter_end_dtd(resource xmlwriter)
 End current DTD - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd)
+static PHP_FUNCTION(xmlwriter_end_dtd)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTD);
 }
@@ -1065,7 +1123,7 @@ PHP_FUNCTION(xmlwriter_end_dtd)
 
 /* {{{ proto bool xmlwriter_write_dtd(resource xmlwriter, string name, string pubid, string sysid, string subset)
 Write full DTD tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd)
+static PHP_FUNCTION(xmlwriter_write_dtd)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1107,7 +1165,7 @@ PHP_FUNCTION(xmlwriter_write_dtd)
 
 /* {{{ proto bool xmlwriter_start_dtd_element(resource xmlwriter, string name)
 Create start DTD element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_element)
+static PHP_FUNCTION(xmlwriter_start_dtd_element)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDElement, "Invalid Element Name");
 }
@@ -1115,7 +1173,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_element)
 
 /* {{{ proto bool xmlwriter_end_dtd_element(resource xmlwriter)
 End current DTD element - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_element)
+static PHP_FUNCTION(xmlwriter_end_dtd_element)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDElement);
 }
@@ -1123,7 +1181,7 @@ PHP_FUNCTION(xmlwriter_end_dtd_element)
 
 /* {{{ proto bool xmlwriter_write_dtd_element(resource xmlwriter, string name, string content)
 Write full DTD element tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_element)
+static PHP_FUNCTION(xmlwriter_write_dtd_element)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1167,7 +1225,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_element)
 #if LIBXML_VERSION > 20608
 /* {{{ proto bool xmlwriter_start_dtd_attlist(resource xmlwriter, string name)
 Create start DTD AttList - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_start_dtd_attlist)
 {
 	php_xmlwriter_string_arg(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterStartDTDAttlist, "Invalid Element Name");
 }
@@ -1175,7 +1233,7 @@ PHP_FUNCTION(xmlwriter_start_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_end_dtd_attlist(resource xmlwriter)
 End current DTD AttList - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_end_dtd_attlist)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDAttlist);
 }
@@ -1183,7 +1241,7 @@ PHP_FUNCTION(xmlwriter_end_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_write_dtd_attlist(resource xmlwriter, string name, string content)
 Write full DTD AttList tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_attlist)
+static PHP_FUNCTION(xmlwriter_write_dtd_attlist)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1228,7 +1286,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_attlist)
 
 /* {{{ proto bool xmlwriter_start_dtd_entity(resource xmlwriter, string name, bool isparam)
 Create start DTD Entity - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_start_dtd_entity)
+static PHP_FUNCTION(xmlwriter_start_dtd_entity)
 {
 	zval *pind;
 	xmlwriter_object *intern;
@@ -1272,36 +1330,42 @@ PHP_FUNCTION(xmlwriter_start_dtd_entity)
 
 /* {{{ proto bool xmlwriter_end_dtd_entity(resource xmlwriter)
 End current DTD Entity - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_end_dtd_entity)
+static PHP_FUNCTION(xmlwriter_end_dtd_entity)
 {
 	php_xmlwriter_end(INTERNAL_FUNCTION_PARAM_PASSTHRU, xmlTextWriterEndDTDEntity);
 }
 /* }}} */
 
-/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content)
+/* {{{ proto bool xmlwriter_write_dtd_entity(resource xmlwriter, string name, string content [, int pe [, string pubid [, string sysid [, string ndataid]]]])
 Write full DTD Entity tag - returns FALSE on error */
-PHP_FUNCTION(xmlwriter_write_dtd_entity)
+static PHP_FUNCTION(xmlwriter_write_dtd_entity)
 {
 	zval *pind;
 	xmlwriter_object *intern;
 	xmlTextWriterPtr ptr;
 	char *name, *content;
 	int name_len, content_len, retval;
+	/* Optional parameters */
+	char *pubid = NULL, *sysid = NULL, *ndataid = NULL;
+	zend_bool pe = 0;
+	int pubid_len, sysid_len, ndataid_len;
 
 #ifdef ZEND_ENGINE_2
 	zval *this = getThis();
 
 	if (this) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss",
-			&name, &name_len, &content, &content_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|bsss",
+			&name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
+			&sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
 			return;
 		}
 		XMLWRITER_FROM_OBJECT(intern, this);
 	} else
 #endif
 	{
-		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &pind, 
-			&name, &name_len, &content, &content_len) == FAILURE) {
+		if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss|bsss", &pind, 
+			&name, &name_len, &content, &content_len, &pe, &pubid, &pubid_len,
+			&sysid, &sysid_len, &ndataid, &ndataid_len) == FAILURE) {
 			return;
 		}
 		ZEND_FETCH_RESOURCE(intern,xmlwriter_object *, &pind, -1, "XMLWriter", le_xmlwriter);
@@ -1312,7 +1376,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_entity)
 	ptr = intern->ptr;
 
 	if (ptr) {
-		retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name, (xmlChar *)content);
+		retval = xmlTextWriterWriteDTDEntity(ptr, pe, (xmlChar *)name, (xmlChar *)pubid, (xmlChar *)sysid, (xmlChar *)ndataid, (xmlChar *)content);
 		if (retval != -1) {
 			RETURN_TRUE;
 		}
@@ -1325,7 +1389,7 @@ PHP_FUNCTION(xmlwriter_write_dtd_entity)
 
 /* {{{ proto resource xmlwriter_open_uri(resource xmlwriter, string source)
 Create new xmlwriter using source uri for output */
-PHP_FUNCTION(xmlwriter_open_uri)
+static PHP_FUNCTION(xmlwriter_open_uri)
 {
 	char *valid_file = NULL;
 	xmlwriter_object *intern;
@@ -1345,7 +1409,6 @@ PHP_FUNCTION(xmlwriter_open_uri)
 #endif
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &source, &source_len) == FAILURE) {
-		WRONG_PARAM_COUNT;
 		return;
 	}
 	
@@ -1407,7 +1470,7 @@ PHP_FUNCTION(xmlwriter_open_uri)
 
 /* {{{ proto resource xmlwriter_open_memory()
 Create new xmlwriter using memory for string output */
-PHP_FUNCTION(xmlwriter_open_memory)
+static PHP_FUNCTION(xmlwriter_open_memory)
 {
 	xmlwriter_object *intern;
 	xmlTextWriterPtr ptr;
@@ -1508,7 +1571,7 @@ static void php_xmlwriter_flush(INTERNAL_FUNCTION_PARAMETERS, int force_string)
 
 /* {{{ proto string xmlwriter_output_memory(resource xmlwriter [,bool flush])
 Output current buffer as string */
-PHP_FUNCTION(xmlwriter_output_memory)
+static PHP_FUNCTION(xmlwriter_output_memory)
 {
 	php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
 }
@@ -1516,7 +1579,7 @@ PHP_FUNCTION(xmlwriter_output_memory)
 
 /* {{{ proto mixed xmlwriter_flush(resource xmlwriter [,bool empty])
 Output current buffer */
-PHP_FUNCTION(xmlwriter_flush)
+static PHP_FUNCTION(xmlwriter_flush)
 {
 	php_xmlwriter_flush(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
 }
@@ -1524,7 +1587,7 @@ PHP_FUNCTION(xmlwriter_flush)
 
 /* {{{ PHP_MINIT_FUNCTION
  */
-PHP_MINIT_FUNCTION(xmlwriter)
+static PHP_MINIT_FUNCTION(xmlwriter)
 {
 #ifdef ZEND_ENGINE_2
 	zend_class_entry ce;
@@ -1545,7 +1608,7 @@ PHP_MINIT_FUNCTION(xmlwriter)
 
 /* {{{ PHP_MSHUTDOWN_FUNCTION
  */
-PHP_MSHUTDOWN_FUNCTION(xmlwriter)
+static PHP_MSHUTDOWN_FUNCTION(xmlwriter)
 {
 	return SUCCESS;
 }
@@ -1553,7 +1616,7 @@ PHP_MSHUTDOWN_FUNCTION(xmlwriter)
 
 /* {{{ PHP_MINFO_FUNCTION
  */
-PHP_MINFO_FUNCTION(xmlwriter)
+static PHP_MINFO_FUNCTION(xmlwriter)
 {
 	php_info_print_table_start();
 	{
diff --git a/ext/xmlwriter/php_xmlwriter.h b/ext/xmlwriter/php_xmlwriter.h
index 1cc624fa6..d37ce7e44 100644
--- a/ext/xmlwriter/php_xmlwriter.h
+++ b/ext/xmlwriter/php_xmlwriter.h
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2006 The PHP Group                                |
+  | Copyright (c) 1997-2007 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_xmlwriter.h,v 1.10.2.5.2.1 2006/05/10 19:38:35 rrichards Exp $ */
+/* $Id: php_xmlwriter.h,v 1.10.2.5.2.3 2007/01/01 09:36:10 sebastian Exp $ */
 
 #ifndef PHP_XMLWRITER_H
 #define PHP_XMLWRITER_H
@@ -25,12 +25,6 @@
 extern zend_module_entry xmlwriter_module_entry;
 #define phpext_xmlwriter_ptr &xmlwriter_module_entry
 
-#ifdef PHP_WIN32
-#define PHP_XMLWRITER_API __declspec(dllexport)
-#else
-#define PHP_XMLWRITER_API
-#endif
-
 #ifdef ZTS
 #include "TSRM.h"
 #endif
@@ -55,56 +49,6 @@ typedef struct _ze_xmlwriter_object {
 	xmlwriter_object *xmlwriter_ptr;
 } ze_xmlwriter_object;
 
-zend_class_entry *xmlwriter_class_entry_ce;
-
-#if LIBXML_VERSION >= 20605
-PHP_FUNCTION(xmlwriter_set_indent);
-PHP_FUNCTION(xmlwriter_set_indent_string);
-#endif
-PHP_FUNCTION(xmlwriter_start_attribute);
-PHP_FUNCTION(xmlwriter_end_attribute);
-PHP_FUNCTION(xmlwriter_write_attribute);
-#if LIBXML_VERSION > 20617
-PHP_FUNCTION(xmlwriter_start_attribute_ns);
-PHP_FUNCTION(xmlwriter_write_attribute_ns);
-#endif
-PHP_FUNCTION(xmlwriter_start_element);
-PHP_FUNCTION(xmlwriter_end_element);
-PHP_FUNCTION(xmlwriter_full_end_element);
-PHP_FUNCTION(xmlwriter_start_element_ns);
-PHP_FUNCTION(xmlwriter_write_element);
-PHP_FUNCTION(xmlwriter_write_element_ns);
-PHP_FUNCTION(xmlwriter_start_pi);
-PHP_FUNCTION(xmlwriter_end_pi);
-PHP_FUNCTION(xmlwriter_write_pi);
-PHP_FUNCTION(xmlwriter_start_cdata);
-PHP_FUNCTION(xmlwriter_end_cdata);
-PHP_FUNCTION(xmlwriter_write_cdata);
-PHP_FUNCTION(xmlwriter_text);
-PHP_FUNCTION(xmlwriter_write_raw);
-PHP_FUNCTION(xmlwriter_start_document);
-PHP_FUNCTION(xmlwriter_end_document);
-#if LIBXML_VERSION >= 20607
-PHP_FUNCTION(xmlwriter_start_comment);
-PHP_FUNCTION(xmlwriter_end_comment);
-#endif
-PHP_FUNCTION(xmlwriter_write_comment);
-PHP_FUNCTION(xmlwriter_start_dtd);
-PHP_FUNCTION(xmlwriter_end_dtd);
-PHP_FUNCTION(xmlwriter_write_dtd);
-PHP_FUNCTION(xmlwriter_start_dtd_element);
-PHP_FUNCTION(xmlwriter_end_dtd_element);
-PHP_FUNCTION(xmlwriter_write_dtd_element);
-#if LIBXML_VERSION > 20608
-PHP_FUNCTION(xmlwriter_start_dtd_attlist);
-PHP_FUNCTION(xmlwriter_end_dtd_attlist);
-PHP_FUNCTION(xmlwriter_write_dtd_attlist);
-#endif
-PHP_FUNCTION(xmlwriter_open_uri);
-PHP_FUNCTION(xmlwriter_open_memory);
-PHP_FUNCTION(xmlwriter_output_memory);
-PHP_FUNCTION(xmlwriter_flush);
-
 #endif	/* PHP_XMLWRITER_H */
 
 /*
diff --git a/ext/xmlwriter/tests/008.phpt b/ext/xmlwriter/tests/008.phpt
index 4583c931a..cb6983d15 100644
--- a/ext/xmlwriter/tests/008.phpt
+++ b/ext/xmlwriter/tests/008.phpt
@@ -6,11 +6,15 @@ if (!extension_loaded("xmlwriter")) die("skip");
 ?>
 --FILE--
 <?php 
-/* $Id: 008.phpt,v 1.1.2.3 2005/12/12 21:21:11 tony2001 Exp $ */
+/* $Id: 008.phpt,v 1.1.2.3.2.1 2007/01/06 15:53:33 bjori Exp $ */
 
 $xw = xmlwriter_open_memory();
 xmlwriter_set_indent($xw, TRUE);
 xmlwriter_start_document($xw, NULL, "UTF-8");
+xmlwriter_start_dtd_entity($xw, "ent", false);
+xmlwriter_text($xw, "val");
+xmlwriter_end_dtd_entity($xw);
+xmlwriter_write_dtd_entity($xw, "ent2", "val2");
 xmlwriter_write_dtd_element($xw, 'sxe', '(elem1+, elem11, elem22*)');
 xmlwriter_write_dtd_attlist($xw, 'sxe', 'id     CDATA  #implied');
 xmlwriter_start_dtd_element($xw, 'elem1');
@@ -27,6 +31,8 @@ print $output;
 ?>
 --EXPECT--
 <?xml version="1.0" encoding="UTF-8"?>
+<!ENTITY ent "val">
+<!ENTITY ent2 "val2">
 <!ELEMENT sxe (elem1+, elem11, elem22*)>
 <!ATTLIST sxe id     CDATA  #implied>
 <!ELEMENT elem1 elem2*>
diff --git a/ext/xmlwriter/tests/bug39504.phpt b/ext/xmlwriter/tests/bug39504.phpt
new file mode 100644
index 000000000..669c77ee2
--- /dev/null
+++ b/ext/xmlwriter/tests/bug39504.phpt
@@ -0,0 +1,32 @@
+--TEST--
+Bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag, not enity)
+--FILE--
+<?php
+
+$xw = xmlwriter_open_memory();
+xmlwriter_start_document($xw, NULL, "UTF-8");
+xmlwriter_start_dtd($xw, "root");
+xmlwriter_write_dtd_entity($xw, "ent2", "val2");
+xmlwriter_end_dtd($xw);
+xmlwriter_start_element($xw, "root");
+xmlwriter_end_document($xw);
+print xmlwriter_flush($xw, true);
+print "\n";
+
+$xw = new XMLWriter();
+$xw->openMemory();
+$xw->startDocument(NULL, "UTF-8");
+$xw->startDtd("root");
+$xw->writeDtdEntity("c", NULL, 0, "-//W3C//TEXT copyright//EN", "http://www.w3.org/xmlspec/copyright.xml");
+$xw->endDtd();
+$xw->startElement("root");
+$xw->endDocument();
+print $xw->flush(true);
+
+?>
+--EXPECTF--
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE root [<!ENTITY ent2 "val2">]><root/>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE root [<!ENTITY c PUBLIC "-//W3C//TEXT copyright//EN" "http://www.w3.org/xmlspec/copyright.xml">]><root/>