matts 2003/02/07 04:22:25
Modified: lib Tag: AxKit-1_6_1 AxKit.pm
lib/Apache/AxKit/Language Tag: AxKit-1_6_1 XSP.pm
Log:
Merge from HEAD warnings and Common patch
Revision Changes Path
No revision
No revision
1.39.2.3 +3 -3 xml-axkit/lib/AxKit.pm
Index: AxKit.pm
===================================================================
RCS file: /home/cvs/xml-axkit/lib/AxKit.pm,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -r1.39.2.2 -r1.39.2.3
--- AxKit.pm 5 Feb 2003 14:51:22 -0000 1.39.2.2
+++ AxKit.pm 7 Feb 2003 12:22:25 -0000 1.39.2.3
@@ -558,8 +558,8 @@
if ($result_code == OK) {
# results now in $r->pnotes('xml_string') - probably...
- if (length($r->pnotes('xml_string'))) {
- my $str = $r->pnotes('xml_string');
+ if ( my $str = $r->pnotes('xml_string') ) {
+ # NB: this is naive, but "0" isn't valid XML anyway
$r->pnotes('xml_string', undef);
AxKit::Debug(10, "get_axkit_uri returning (str): '$str'");
return $str;
No revision
No revision
1.34.2.1 +1 -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.34
retrieving revision 1.34.2.1
diff -u -r1.34 -r1.34.2.1
--- XSP.pm 2 Feb 2003 13:08:23 -0000 1.34
+++ XSP.pm 7 Feb 2003 12:22:25 -0000 1.34.2.1
@@ -919,7 +919,6 @@
package AxKit::XSP::SAXParser;
use XML::LibXML 1.30;
-use XML::LibXML::Common qw(:libxml :encoding);
sub new {
my ($type, %self) = @_;
