From 0e7e4d30f6d78bd6148c15527e571a1812cf513d Mon Sep 17 00:00:00 2001
From: Andrei Zmievski <andrei@php.net>
Date: Mon, 28 Feb 2000 17:16:12 +0000
Subject: [PATCH] WDDX header comments now conform to the latest DTD.

---
 ext/wddx/php_wddx_api.h |  5 ++++-
 ext/wddx/wddx.c         | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ext/wddx/php_wddx_api.h b/ext/wddx/php_wddx_api.h
index d912de661e..a6190d5373 100644
--- a/ext/wddx/php_wddx_api.h
+++ b/ext/wddx/php_wddx_api.h
@@ -25,10 +25,13 @@
 #define WDDX_ARRAY_E			"</array>"
 #define WDDX_BOOLEAN			"<boolean value='%s'/>"
 #define WDDX_CHAR				"<char code='%02X'/>"
+#define WDDX_COMMENT_S			"<comment>"
+#define WDDX_COMMENT_E			"</comment>"
 #define WDDX_DATA_S				"<data>"
 #define WDDX_DATA_E				"</data>"
 #define WDDX_HEADER				"<header/>"
-#define WDDX_HEADER_COMMENT		"<header comment='%s'/>"
+#define WDDX_HEADER_S			"<header>"
+#define WDDX_HEADER_E			"</header>"
 #define WDDX_NULL				"<null/>"
 #define WDDX_NUMBER				"<number>%s</number>"
 #define WDDX_PACKET_S			"<wddxPacket version='1.0'>"
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 554a388f44..0f75b69021 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -263,15 +263,15 @@ char* php_wddx_gather(wddx_packet *packet)
 /* {{{ void php_wddx_packet_start */
 void php_wddx_packet_start(wddx_packet *packet, char *comment)
 {
-	char tmp_buf[WDDX_BUF_LEN];
-	
 	php_wddx_add_chunk(packet, WDDX_PACKET_S);
 	if (comment)
 	{
-		sprintf(tmp_buf, WDDX_HEADER_COMMENT, comment);
-		php_wddx_add_chunk(packet, tmp_buf);
-	}
-	else
+		php_wddx_add_chunk(packet, WDDX_HEADER_S);
+		php_wddx_add_chunk(packet, WDDX_COMMENT_S);
+		php_wddx_add_chunk(packet, comment);
+		php_wddx_add_chunk(packet, WDDX_COMMENT_E);
+		php_wddx_add_chunk(packet, WDDX_HEADER_E);
+	} else
 		php_wddx_add_chunk(packet, WDDX_HEADER);
 	php_wddx_add_chunk(packet, WDDX_DATA_S);
 }
-- 
2.50.1