CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

hiawatha: add new patch to fix xslt implementation

Browse Source 
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
This commit is contained in:
Jack Mitchell 2012-12-04 12:12:51 +00:00 committed by Eric Bénard
parent c5f4259852
commit 12609b18ad
2 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
meta-webserver/recipes-httpd/hiawatha/files/xslt-fix.patch Normal file
View File

@ -0,0 +1,71 @@
Upstream Status: Backport
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
---
src/xslt.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/xslt.c b/src/xslt.c
index 9d8d31a..58ca52d 100644
--- a/src/xslt.c
+++ b/src/xslt.c
@@ -23,6 +23,7 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#include "libstr.h"
+#include "liblist.h"
#include "send.h"
#include "log.h"
#ifdef ENABLE_TOMAHAWK
@@ -343,10 +344,10 @@ bool can_transform_with_xslt(t_session *session) {
static int apply_xslt_sheet(t_session *session, xmlDocPtr data_xml) {
xmlDocPtr style_xml, result_xml;
xsltStylesheetPtr xslt;
- xmlOutputBufferPtr output;
+ xmlChar *raw_xml;
char value[VALUE_SIZE + 1];
const char **params;
- int result = 200;
+ int result = 200, raw_size;
/* Read XML data
*/
@@ -396,14 +397,8 @@ static int apply_xslt_sheet(t_session *session, xmlDocPtr data_xml) {
xsltFreeStylesheet(xslt);
return 500;
}
- if ((output = xmlAllocOutputBuffer(NULL)) == NULL) {
- xmlFreeDoc(result_xml);
- xsltFreeStylesheet(xslt);
- return 500;
- }
- if (xsltSaveResultTo(output, result_xml, xslt) == -1) {
+ if (xsltSaveResultToString(&raw_xml, &raw_size, result_xml, xslt) == -1) {
log_file_error(session, session->file_on_disk, "transformation error");
- xmlOutputBufferClose(output);
xmlFreeDoc(result_xml);
xsltFreeStylesheet(xslt);
return 500;
@@ -414,17 +409,17 @@ static int apply_xslt_sheet(t_session *session, xmlDocPtr data_xml) {
value[VALUE_SIZE] = '\0';
if (send_buffer(session, hs_conlen, 16) == -1) {
result = -1;
- } else if (snprintf(value, VALUE_SIZE, "%d\r\n\r\n", output->buffer->use) == -1) {
+ } else if (snprintf(value, VALUE_SIZE, "%d\r\n\r\n", raw_size) == -1) {
result = -1;
} else if (send_buffer(session, value, strlen(value)) == -1) {
result = -1;
- } else if (send_buffer(session, (char*)output->buffer->content, output->buffer->use) == -1) {
+ } else if (send_buffer(session, (char*)raw_xml, raw_size) == -1) {
result = -1;
}
/* Free buffers
*/
- xmlOutputBufferClose(output);
+ xmlFree(raw_xml);
xmlFreeDoc(result_xml);
xsltFreeStylesheet(xslt);
--
1.8.0.1

5
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb
View File

@ -4,12 +4,13 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
DEPENDS = "libxml2 libxslt" DEPENDS = "libxml2 libxslt"
PR = "r1" PR = "r2"
SECTION = "net" SECTION = "net"
SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
file://hiawatha-init" file://hiawatha-init \
file://xslt-fix.patch "
SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c" SRC_URI[md5sum] = "372ea9e8329ed36e4fb781fdc1a6734c"
SRC_URI[sha256sum] = "1a7fa98ce66beb54fc8490cc787461d719a98cb0e4a81caedfa18ac8b5ba3b3b" SRC_URI[sha256sum] = "1a7fa98ce66beb54fc8490cc787461d719a98cb0e4a81caedfa18ac8b5ba3b3b"