mirror of
https://gitlab.xiph.org/xiph/icecast-server.git
synced 2025-02-02 15:07:36 -05:00
make sure that older xslt libs on non-win32 can be used as well
svn path=/icecast/trunk/icecast/; revision=9739
This commit is contained in:
parent
6d2cc1036d
commit
61267a308b
60
src/xslt.c
60
src/xslt.c
@ -30,38 +30,14 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifdef HAVE_SYS_TIME_H
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
int xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, xmlDocPtr result, xsltStylesheetPtr style) {
|
|
||||||
xmlOutputBufferPtr buf;
|
|
||||||
|
|
||||||
*doc_txt_ptr = NULL;
|
|
||||||
*doc_txt_len = 0;
|
|
||||||
if (result->children == NULL)
|
|
||||||
return(0);
|
|
||||||
|
|
||||||
buf = xmlAllocOutputBuffer(NULL);
|
|
||||||
|
|
||||||
if (buf == NULL)
|
|
||||||
return(-1);
|
|
||||||
xsltSaveResultTo(buf, result, style);
|
|
||||||
if (buf->conv != NULL) {
|
|
||||||
*doc_txt_len = buf->conv->use;
|
|
||||||
*doc_txt_ptr = xmlStrndup(buf->conv->content, *doc_txt_len);
|
|
||||||
} else {
|
|
||||||
*doc_txt_len = buf->buffer->use;
|
|
||||||
*doc_txt_ptr = xmlStrndup(buf->buffer->content, *doc_txt_len);
|
|
||||||
}
|
|
||||||
(void)xmlOutputBufferClose(buf);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "thread/thread.h"
|
#include "thread/thread.h"
|
||||||
#include "avl/avl.h"
|
#include "avl/avl.h"
|
||||||
#include "httpp/httpp.h"
|
#include "httpp/httpp.h"
|
||||||
@ -86,14 +62,43 @@ typedef struct {
|
|||||||
xsltStylesheetPtr stylesheet;
|
xsltStylesheetPtr stylesheet;
|
||||||
} stylesheet_cache_t;
|
} stylesheet_cache_t;
|
||||||
|
|
||||||
|
#ifndef HAVE_XSLTSAVERESULTTOSTRING
|
||||||
|
int xsltSaveResultToString(xmlChar **doc_txt_ptr, int * doc_txt_len, xmlDocPtr result, xsltStylesheetPtr style) {
|
||||||
|
xmlOutputBufferPtr buf;
|
||||||
|
|
||||||
|
*doc_txt_ptr = NULL;
|
||||||
|
*doc_txt_len = 0;
|
||||||
|
if (result->children == NULL)
|
||||||
|
return(0);
|
||||||
|
|
||||||
|
buf = xmlAllocOutputBuffer(NULL);
|
||||||
|
|
||||||
|
if (buf == NULL)
|
||||||
|
return(-1);
|
||||||
|
xsltSaveResultTo(buf, result, style);
|
||||||
|
if (buf->conv != NULL) {
|
||||||
|
*doc_txt_len = buf->conv->use;
|
||||||
|
*doc_txt_ptr = xmlStrndup(buf->conv->content, *doc_txt_len);
|
||||||
|
} else {
|
||||||
|
*doc_txt_len = buf->buffer->use;
|
||||||
|
*doc_txt_ptr = xmlStrndup(buf->buffer->content, *doc_txt_len);
|
||||||
|
}
|
||||||
|
(void)xmlOutputBufferClose(buf);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Keep it small... */
|
/* Keep it small... */
|
||||||
#define CACHESIZE 3
|
#define CACHESIZE 3
|
||||||
|
|
||||||
stylesheet_cache_t cache[CACHESIZE];
|
static stylesheet_cache_t cache[CACHESIZE];
|
||||||
mutex_t xsltlock;
|
static mutex_t xsltlock;
|
||||||
|
|
||||||
void xslt_initialize()
|
void xslt_initialize()
|
||||||
{
|
{
|
||||||
|
xmlSubstituteEntitiesDefault(1);
|
||||||
|
xmlLoadExtDtdDefaultValue = 1;
|
||||||
|
|
||||||
memset(cache, 0, sizeof(stylesheet_cache_t)*CACHESIZE);
|
memset(cache, 0, sizeof(stylesheet_cache_t)*CACHESIZE);
|
||||||
thread_mutex_create(&xsltlock);
|
thread_mutex_create(&xsltlock);
|
||||||
xmlSubstituteEntitiesDefault(1);
|
xmlSubstituteEntitiesDefault(1);
|
||||||
@ -209,6 +214,7 @@ void xslt_transform(xmlDocPtr doc, const char *xslfilename, client_t *client)
|
|||||||
if (string == NULL)
|
if (string == NULL)
|
||||||
string = xmlStrdup ("");
|
string = xmlStrdup ("");
|
||||||
client->respcode = 200;
|
client->respcode = 200;
|
||||||
|
client_set_queue (client, NULL);
|
||||||
client->refbuf = refbuf_new (buf_len);
|
client->refbuf = refbuf_new (buf_len);
|
||||||
len = snprintf (client->refbuf->data, buf_len, "%s%d\r\n\r\n%s", http, len, string);
|
len = snprintf (client->refbuf->data, buf_len, "%s%d\r\n\r\n%s", http, len, string);
|
||||||
client->refbuf->len = len;
|
client->refbuf->len = len;
|
||||||
|
Loading…
Reference in New Issue
Block a user