Added patches.

4 files changed, 128 insertions, 2 deletions

diff --git a/net-www/mod_xslt/ChangeLog b/net-www/mod_xslt/ChangeLog
index 81d0b918bef5..e2cf32671082 100644
--- a/net-www/mod_xslt/ChangeLog
+++ b/net-www/mod_xslt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mod_xslt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/ChangeLog,v 1.7 2004/04/22 23:30:59 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/ChangeLog,v 1.8 2004/04/23 13:58:50 zul Exp $
+
+  23 Apr 2004; Chuck Short <zul@gentoo.org> mod_xslt-1.0.5a.ebuild,
+  files/mod-xslt-1.0.5a-content.patch, files/mod-xslt-1.0.5a-debug.patch:
+  Added patches, closes #24104 and 25114.
 
   22 Apr 2004; Chuck Short <zul@gentoo.org> metadata.xml:
   Added metadata.xml
diff --git a/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch b/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch
new file mode 100644
index 000000000000..5a71ba7d2085
--- /dev/null
+++ b/net-www/mod_xslt/files/mod-xslt-1.0.5a-content.patch
@@ -0,0 +1,54 @@
+diff -urN mod-xslt-1.0.5a/src/mod-xslt.c mod-xslt-1.0.5a-noencoding/src/mod-xslt.c
+--- mod-xslt-1.0.5a/src/mod-xslt.c	2002-10-27 19:16:41.000000000 +0100
++++ mod-xslt-1.0.5a-noencoding/src/mod-xslt.c	2003-07-23 15:11:44.000000000 +0200
+@@ -113,26 +113,26 @@
+ 
+ void xslt_set_headers(apr_table_t *resheaders, apr_pool_t *pool, xsltStylesheetPtr stylesheet) {
+ 	if (stylesheet->encoding){
+-		apr_table_set(resheaders, "Content-Encoding", (const char*)stylesheet->encoding);
++		apr_table_set(resheaders, "X-Charset", (const char*)stylesheet->encoding);
+ 	} else {
+-		apr_table_set(resheaders, "Content-Encoding", "UTF-8");
++		apr_table_set(resheaders, "X-Charset", "UTF-8");
+ 	}
+ 
+ 	if (stylesheet->mediaType){
+-		apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"Content-Encoding")));
++		apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"X-Charset")));
+ 	} else {
+ 		if (stylesheet->method){
+ 			if (strcmp((char*)stylesheet->method,"xml") == 0){
+-				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/xml",apr_table_get(resheaders,"Content-Encoding")));
++				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/xml",apr_table_get(resheaders,"X-Charset")));
+ 			} else if (strcmp((char*)stylesheet->method,"html") == 0){
+-				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding")));
++				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset")));
+ 			}else if (strcmp((char*)stylesheet->method,"text") == 0){
+-				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/plain",apr_table_get(resheaders,"Content-Encoding")));
++				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/plain",apr_table_get(resheaders,"X-Charset")));
+ 			} else {
+-				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding")));
++				apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset")));
+ 			}            
+ 		} else {
+-			apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"Content-Encoding")));
++			apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s","text/html",apr_table_get(resheaders,"X-Charset")));
+ 		}
+ 	}
+ }
+@@ -229,13 +229,12 @@
+ 				writeLog(APLOG_ERR,"%s could not be transformed",f->r->unparsed_uri);
+ 			} else {
+ 				xslt_set_headers(f->r->headers_out,f->r->pool,stylesheet);
+-				f->r->content_encoding=apr_table_get(f->r->headers_out, "Content-Encoding");
+ 				f->r->content_type=apr_table_get(f->r->headers_out, "Content-Type");
+-				writeLog(APLOG_DEBUG,"charset = %s",apr_table_get(f->r->headers_out,"Content-Encoding"));
++				writeLog(APLOG_DEBUG,"charset = %s",apr_table_get(f->r->headers_out,"X-Charset"));
+ 
+ 				xmlSetGenericErrorFunc(NULL, xslt_error);
+ 				xsltSetGenericErrorFunc(NULL, xslt_error);
+-				encoder = xmlFindCharEncodingHandler((const char*)apr_table_get(f->r->headers_out,"Content-Encoding"));
++				encoder = xmlFindCharEncodingHandler((const char*)apr_table_get(f->r->headers_out,"X-Charset"));
+ 				if (encoder) {
+ 					writeLog(APLOG_DEBUG,"found encoder");
+ 					output = xmlAllocOutputBuffer(encoder);
diff --git a/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch b/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch
new file mode 100644
index 000000000000..504799caedf3
--- /dev/null
+++ b/net-www/mod_xslt/files/mod-xslt-1.0.5a-debug.patch
@@ -0,0 +1,66 @@
+diff -urN mod-xslt-1.0.5a/src/logging.c mod-xslt-1.0.5a-nodebug/src/logging.c
+--- mod-xslt-1.0.5a/src/logging.c	2002-08-13 12:03:07.000000000 +0200
++++ mod-xslt-1.0.5a-nodebug/src/logging.c	2003-07-23 12:05:31.000000000 +0200
+@@ -49,7 +49,6 @@
+ #ifndef LOGLEVEL
+ #define LOGLEVEL 8
+ #endif
+-#define DEBUG
+ 
+ #ifndef LOGPREFIX
+ #define LOGPREFIX "mod-xslt: %s"
+@@ -59,7 +58,7 @@
+ 
+ void initLog(request_rec* r) {
+ 	request=r;
+-	writeLog(7,"start logging");
++	writeLog(APLOG_DEBUG, "start logging");
+ 	return;
+ }
+ 
+@@ -84,7 +83,7 @@
+ #endif
+ 		if ((tmplen > 0) & (temp != NULL)) {
+ 			if (temp[0] != 0) {
+-				ap_log_rerror(APLOG_MARK,level, 0, request, LOGPREFIX, temp);
++				ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|level, 0, request, LOGPREFIX, temp);
+ 			}
+ 		}
+ 	}
+@@ -93,7 +92,7 @@
+ }
+ 
+ void finiLog() {
+-	writeLog(7,"stop logging");
++	writeLog(APLOG_DEBUG,"stop logging");
+ 	request=NULL;
+ 	return;
+ }
+diff -urN mod-xslt-1.0.5a/src/mod-xslt.c mod-xslt-1.0.5a-nodebug/src/mod-xslt.c
+--- mod-xslt-1.0.5a/src/mod-xslt.c	2002-10-27 19:16:41.000000000 +0100
++++ mod-xslt-1.0.5a-nodebug/src/mod-xslt.c	2003-07-23 12:03:07.000000000 +0200
+@@ -106,7 +106,7 @@
+ 	tmplen = vsnprintf(temp,tmplen,msg,args);
+ 	va_end;
+ 	temp[tmplen] = 0;
+-	writeLog(APLOG_NOTICE,temp);
++	writeLog(APLOG_ERR, temp);
+ 	free(temp);
+ 	return;
+ }
+@@ -313,13 +313,13 @@
+ }
+ 
+ static apr_status_t xslt_child_exit(void *data) {
+-	ap_log_perror(APLOG_MARK,APLOG_NOTICE, 0, (apr_pool_t *)data, "Finalizing Child");
++	ap_log_perror(APLOG_MARK,APLOG_NOERRNO|APLOG_DEBUG, 0, (apr_pool_t *)data, "Finalizing Child");
+ 	xmlCleanupParser();
+ 	xmlMemoryDump();
+ }
+ 
+ static void xslt_child_init(apr_pool_t *p, server_rec *s) {
+-	ap_log_perror(APLOG_MARK,APLOG_NOTICE, 0, p, "Initializing Child");	
++	ap_log_perror(APLOG_MARK,APLOG_NOERRNO|APLOG_DEBUG, 0, p, "Initializing Child");	
+ 	apr_pool_cleanup_register(p, p, xslt_child_exit, xslt_child_exit);
+ 	xmlInitMemory();
+ 	xmlLineNumbersDefault(XSL_LINENUMBERSDEFAULT);
diff --git a/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild b/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild
index 6e040f622b4c..49585910e422 100644
--- a/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild
+++ b/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild,v 1.6 2004/04/22 23:29:32 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_xslt/mod_xslt-1.0.5a.ebuild,v 1.7 2004/04/23 13:58:50 zul Exp $
 
 inherit eutils
 
@@ -19,6 +19,8 @@ SLOT="0"
 src_unpack() {
 	unpack ${A} || die; cd ${S} || die
 	epatch ${FILESDIR}/mod_xslt-1.0.5a-register.patch
+	epatch ${FILESDIR}/mod-xslt-1.0.5a-debug.patch
+	epatch ${FILESDIR}/mod-xslt-1.0.5a-content.patch
 	epatch ${FILESDIR}/mod_xslt-1.05a.patch
 	#oh brother
 	cp configure.ac configure.ac.orig