WDDX header comments now conform to the latest DTD.

diff --git a/ext/wddx/php_wddx_api.h b/ext/wddx/php_wddx_api.h
index d912de661e4c02c9948865daeea8a00c7c821dea..a6190d5373c07be177cd8ac08d9558b9b42392dd 100644 (file)
--- 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 554a388f4476bcc4f6abd02e26bde8e9ea53ae81..0f75b690216048b93f220e7c8acb976f39c1bacc 100644 (file)
--- 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);
 }