matts 2003/07/28 15:53:21
Modified: . MANIFEST
lib/Apache/AxKit LibXMLSupport.pm Provider.pm
lib/Apache/AxKit/Language HtmlDoc.pm LibXSLT.pm XSP.pm
Log:
Merged in 1.62 changes
Revision Changes Path
1.18 +3 -1 xml-axkit/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/xml-axkit/MANIFEST,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MANIFEST 16 Jul 2003 14:40:57 -0000 1.17
+++ MANIFEST 28 Jul 2003 22:53:20 -0000 1.18
@@ -110,6 +110,7 @@
demo/xsp/sendmail.xsp
demo/xsp/session.xsp
demo/xsp/showsource.xsp
+demo/xsp/simple-input-attributes.xsp
demo/xsp/simpletaglib-object.xsp
demo/xsp/simpletaglib-simple.xsp
demo/xsp/tlh.xsp
@@ -172,7 +173,7 @@
t/05mediachooser.t
t/test_module.pl
t/lib/Provider/Tiny.pm
-t/conf/extra.conf.in
+t/conf/extra.last.conf.in
t/conf/startup.pl.in
t/htdocs/style/xslt-basic/01.xsl
t/htdocs/style/xslt-basic/02_include.xsl
@@ -181,6 +182,7 @@
t/htdocs/style/xslt-basic/03_document.xml
t/htdocs/style/xslt-basic/04_document_2args.xsl
t/htdocs/xslt-basic/01.xml
+t/htdocs/xslt-basic/02_include.xml
t/htdocs/xslt-basic/03_document_1arg.xml
t/htdocs/xslt-basic/04_document_2args.xml
t/htdocs/xslt-basic/04_document.xml
1.3 +2 -1 xml-axkit/lib/Apache/AxKit/LibXMLSupport.pm
Index: LibXMLSupport.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/LibXMLSupport.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LibXMLSupport.pm 18 Mar 2003 15:19:46 -0000 1.2
+++ LibXMLSupport.pm 28 Jul 2003 22:53:20 -0000 1.3
@@ -10,6 +10,7 @@
$provider_cb = \&get_provider;
sub reset {
+ my $class = shift;
$XML::LibXML::match_cb = \&match_uri;
$XML::LibXML::read_cb = \&read_uri;
$XML::LibXML::close_cb = \&close_uri;
1.15 +4 -2 xml-axkit/lib/Apache/AxKit/Provider.pm
Index: Provider.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Provider.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Provider.pm 16 Jul 2003 08:57:20 -0000 1.14
+++ Provider.pm 28 Jul 2003 22:53:20 -0000 1.15
@@ -73,7 +73,9 @@
my $parser = XML::LibXML->new();
$parser->expand_entities(1);
- Apache::AxKit::LibXMLSupport->reset;
+ local($XML::LibXML::match_cb, $XML::LibXML::open_cb,
+ $XML::LibXML::read_cb, $XML::LibXML::close_cb);
+ Apache::AxKit::LibXMLSupport->reset($parser);
my $xml_doc;
eval {
1.5 +4 -2 xml-axkit/lib/Apache/AxKit/Language/HtmlDoc.pm
Index: HtmlDoc.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Language/HtmlDoc.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HtmlDoc.pm 18 Feb 2003 22:37:22 -0000 1.4
+++ HtmlDoc.pm 28 Jul 2003 22:53:20 -0000 1.5
@@ -26,7 +26,9 @@
my ($r, $xml_provider, undef, $last_in_chain) = @_;
my $parser = XML::LibXML->new();
- Apache::AxKit::LibXMLSupport->reset;
+ local($XML::LibXML::match_cb, $XML::LibXML::open_cb,
+ $XML::LibXML::read_cb, $XML::LibXML::close_cb);
+ Apache::AxKit::LibXMLSupport->reset();
my $dom;
my $source_text;
1.21 +8 -3 xml-axkit/lib/Apache/AxKit/Language/LibXSLT.pm
Index: LibXSLT.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Language/LibXSLT.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- LibXSLT.pm 18 Mar 2003 15:18:56 -0000 1.20
+++ LibXSLT.pm 28 Jul 2003 22:53:20 -0000 1.21
@@ -49,7 +49,10 @@
my $parser = XML::LibXML->new();
$parser->expand_entities(1);
- Apache::AxKit::LibXMLSupport->reset;
+ local($XML::LibXML::match_cb, $XML::LibXML::open_cb,
+ $XML::LibXML::read_cb, $XML::LibXML::close_cb);
+ Apache::AxKit::LibXMLSupport->reset();
+ warn("parser match_cb: ", $parser->match_callback);
local $Apache::AxKit::LibXMLSupport::provider_cb =
sub {
my $r = shift;
@@ -94,7 +97,9 @@
AxKit::Debug(7, "[LibXSLT] parsing stylesheet $style_uri");
my $style_doc = $style->get_dom();
- Apache::AxKit::LibXMLSupport->reset;
+ local($XML::LibXML::match_cb, $XML::LibXML::open_cb,
+ $XML::LibXML::read_cb, $XML::LibXML::close_cb);
+ Apache::AxKit::LibXMLSupport->reset();
local $Apache::AxKit::LibXMLSupport::provider_cb =
sub {
my $r = shift;
1.46 +4 -2 xml-axkit/lib/Apache/AxKit/Language/XSP.pm
Index: XSP.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/Apache/AxKit/Language/XSP.pm,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- XSP.pm 16 Jul 2003 15:02:11 -0000 1.45
+++ XSP.pm 28 Jul 2003 22:53:20 -0000 1.46
@@ -1025,7 +1025,9 @@
if (ref($thing) ne 'XML::LibXML::Document') {
my $parser = XML::LibXML->new();
- Apache::AxKit::LibXMLSupport->reset();
+ local($XML::LibXML::match_cb, $XML::LibXML::open_cb,
+ $XML::LibXML::read_cb, $XML::LibXML::close_cb);
+ Apache::AxKit::LibXMLSupport->reset($parser);
$parser->expand_entities(1);
eval {
$parser->line_numbers(1);
