diff options
author | grant <grant> | 2003-05-31 14:41:32 +0000 |
---|---|---|
committer | grant <grant> | 2003-05-31 14:41:32 +0000 |
commit | 59809db6de767b6afd04f93a65b482be156c47f2 (patch) | |
tree | 39f3117dd013c27b8393e9583cba6477804007bd /www/ap-xslt/patches | |
parent | 51a0e735b724ed42db5837b2e6a5267dcaf75db6 (diff) | |
download | pkgsrc-59809db6de767b6afd04f93a65b482be156c47f2.tar.gz |
fix a multiline literal, allowing this to be built with gcc-3.3.
Diffstat (limited to 'www/ap-xslt/patches')
-rw-r--r-- | www/ap-xslt/patches/patch-ab | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/www/ap-xslt/patches/patch-ab b/www/ap-xslt/patches/patch-ab index 119f7a52b53..4f223a5b2e6 100644 --- a/www/ap-xslt/patches/patch-ab +++ b/www/ap-xslt/patches/patch-ab @@ -1,9 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/10/23 17:21:57 jwise Exp $ +$NetBSD: patch-ab,v 1.3 2003/05/31 14:41:32 grant Exp $ + This patch incorporates a patch from the mod_xslt project page on sourceforge in order to have a valid base URI set during xslt processing, so that document inclusion will DTRT. ---- mod_xslt.c.orig Wed Aug 23 22:05:28 2000 -+++ mod_xslt.c Tue Oct 23 12:43:12 2001 + +It also fixes two multi-line literals which are disallowed in gcc 3.3. + +--- mod_xslt.c.orig Thu Aug 24 12:05:28 2000 ++++ mod_xslt.c @@ -43,7 +43,7 @@ #include "http_protocol.h" #include "ap_config.h" @@ -13,7 +17,7 @@ inclusion will DTRT. #include "http_core.h" #include "sablot.h" #include "http_log.h" -@@ -195,6 +195,8 @@ +@@ -195,6 +195,8 @@ MessageHandler sablotMH = { int transform(request_rec *r, char *styleSheetStr, char *inputStr, char **resultStr) { int se; @@ -22,7 +26,7 @@ inclusion will DTRT. char *argums[] = { "/_stylesheet", styleSheetStr, -@@ -209,6 +211,14 @@ +@@ -209,6 +211,14 @@ int transform(request_rec *r, char *styl se = SablotCreateProcessor (&theproc); if (cfg->debug) se |= SablotRegHandler(theproc, HLR_MESSAGE, &sablotMH, (void*)r); @@ -37,3 +41,19 @@ inclusion will DTRT. se |= SablotRunProcessor(theproc,"arg:/_stylesheet","arg:/_xmlinput","arg:/_output",NULL,argums); se |= SablotGetResultArg(theproc,"arg:/_output", resultStr); se |= SablotDestroyProcessor(theproc); +@@ -288,12 +298,12 @@ static int mod_xslt_handler(request_rec + + if (!strcmp("xml",mimetype)) + if (cfg->debug){ +- return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite +- recursion. Remove it!\n"); ++ return mod_xslt_debug_out(r, "XSLT DEBUG: \"AddHandler mod_xslt .xml\" will cause infinite\n" ++ "recursion. Remove it!\n"); + return ; + } else { +- ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite +- recursion. Remove it!\n"); ++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server, "\"AddHandler mod_xslt .xml\" will cause infinite\n" ++ "recursion. Remove it!\n"); + return SERVER_ERROR; + } |