[2780] in BarnOwl Developers
[PATCH 1/3] Merged obviouly correct changes from upstream (XML::Stream version 1.23).
daemon@ATHENA.MIT.EDU (Jason Gross)
Sun Nov 14 10:20:53 2010
From: Jason Gross <jgross@MIT.EDU>
To: barnowl-dev@mit.edu
Date: Sun, 14 Nov 2010 10:20:36 -0500
See ticket #152. (https://barnowl.mit.edu:444/ticket/152) This merges
minor changes (spacing, version numbering, spelling, documentation,
etc.) from XML::Stream version 1.23.
---
perl/modules/Jabber/lib/XML/Stream.pm | 19 +++++++++++--------
perl/modules/Jabber/lib/XML/Stream/Namespace.pm | 4 +++-
perl/modules/Jabber/lib/XML/Stream/Node.pm | 4 +++-
perl/modules/Jabber/lib/XML/Stream/Parser.pm | 7 ++++++-
perl/modules/Jabber/lib/XML/Stream/Parser/DTD.pm | 4 +++-
perl/modules/Jabber/lib/XML/Stream/Tree.pm | 4 +++-
perl/modules/Jabber/lib/XML/Stream/XPath.pm | 4 ++--
perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm | 4 ++--
perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm | 4 ++--
perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm | 4 ++--
10 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/perl/modules/Jabber/lib/XML/Stream.pm b/perl/modules/Jabber/lib/XML/Stream.pm
index 3869804..a0b99cd 100644
--- a/perl/modules/Jabber/lib/XML/Stream.pm
+++ b/perl/modules/Jabber/lib/XML/Stream.pm
@@ -24,7 +24,7 @@ package XML::Stream;
=head1 NAME
-XML::Stream - Creates and XML Stream connection and parses return data
+XML::Stream - Creates an XML Stream connection and parses return data
=head1 SYNOPSIS
@@ -36,7 +36,7 @@ XML::Stream - Creates and XML Stream connection and parses return data
server, send a stream of XML to the server, and receive/parse an XML
stream from the server. It is primarily based work for the Etherx XML
router developed by the Jabber Development Team. For more information
- about this project visit http://etherx.jabber.org/stream/.
+ about this project visit http://xmpp.org/protocols/streams/.
XML::Stream gives the user the ability to define a central callback
that will be used to handle the tags received from the server. These
@@ -108,7 +108,7 @@ XML::Stream - Creates and XML Stream connection and parses return data
"http" - HTTP
HTTP recognizes proxies if the ENV
variables http_proxy or https_proxy
- are set. ssl specifies if an SLL
+ are set. ssl specifies if an SSL
socket should be used for encrypted
communications. This function
returns the same hash from GetRoot()
@@ -236,6 +236,8 @@ Colorized, and Dolby Surround sound added by Thomas Charron,
tcharron@jabber.org
By Jeremie in October of 1999 for http://etherx.jabber.org/streams/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -243,7 +245,7 @@ it under the same terms as Perl itself.
=cut
-use 5.006_001;
+use 5.008;
use strict;
use Sys::Hostname;
use IO::Socket;
@@ -255,6 +257,7 @@ use Authen::SASL;
use MIME::Base64;
use utf8;
use Encode;
+use XML::Stream::IO::Select::Win32;
$SIG{PIPE} = "IGNORE";
@@ -290,7 +293,7 @@ else
}
-$VERSION = "1.22";
+$VERSION = "1.23";
$NONBLOCKING = 0;
use XML::Stream::Namespace;
@@ -1160,8 +1163,8 @@ sub OpenStream
$self->{SOCKETS}->{*STDIN} = $sid;
}
- # 08.04.05(Fri) slipstream@yandex.ru for compapility with ejabberd since it reuses stream id
- delete($self->{SIDS}->{$currsid}) unless ($currsid eq $sid);
+ delete($self->{SIDS}->{$currsid})
+ unless $currsid eq $sid;
if (exists($self->GetRoot($sid)->{version}) &&
($self->GetRoot($sid)->{version} ne ""))
@@ -1658,7 +1661,7 @@ sub Send
if ($self->{SIDS}->{$sid}->{select}->can_write(0))
{
$self->debug(3,"Send: can_write");
-
+
$self->{SENDSTRING} = Encode::encode_utf8(join("",@_));
$self->{SENDWRITTEN} = 0;
diff --git a/perl/modules/Jabber/lib/XML/Stream/Namespace.pm b/perl/modules/Jabber/lib/XML/Stream/Namespace.pm
index a9aee25..4490af7 100644
--- a/perl/modules/Jabber/lib/XML/Stream/Namespace.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/Namespace.pm
@@ -85,6 +85,8 @@ a clean way of defining Namespaces for XML::Stream to use when connecting.
Written by Ryan Eatmon in February 2000
Idea By Thomas Charron in January of 2000 for http://etherx.jabber.org/streams/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -96,7 +98,7 @@ use strict;
use Carp;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
sub new
{
diff --git a/perl/modules/Jabber/lib/XML/Stream/Node.pm b/perl/modules/Jabber/lib/XML/Stream/Node.pm
index 4dca834..7c22105 100644
--- a/perl/modules/Jabber/lib/XML/Stream/Node.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/Node.pm
@@ -129,6 +129,8 @@ would be:
By Ryan Eatmon in June 2002 for http://jabber.org/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -138,7 +140,7 @@ it under the same terms as Perl itself.
use vars qw( $VERSION $LOADED );
-$VERSION = "1.22";
+$VERSION = "1.23";
$LOADED = 1;
sub new
diff --git a/perl/modules/Jabber/lib/XML/Stream/Parser.pm b/perl/modules/Jabber/lib/XML/Stream/Parser.pm
index 2005cae..f1f95f8 100644
--- a/perl/modules/Jabber/lib/XML/Stream/Parser.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/Parser.pm
@@ -44,6 +44,8 @@ package XML::Stream::Parser;
By Ryan Eatmon in January of 2001 for http://jabber.org/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -54,7 +56,10 @@ it under the same terms as Perl itself.
use strict;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
+
+use XML::Stream::Tree;
+use XML::Stream::Node;
sub new
{
diff --git a/perl/modules/Jabber/lib/XML/Stream/Parser/DTD.pm b/perl/modules/Jabber/lib/XML/Stream/Parser/DTD.pm
index 25dc888..dd692d1 100644
--- a/perl/modules/Jabber/lib/XML/Stream/Parser/DTD.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/Parser/DTD.pm
@@ -44,6 +44,8 @@ package XML::Stream::Parser::DTD;
By Ryan Eatmon in February of 2001 for http://jabber.org/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -54,7 +56,7 @@ it under the same terms as Perl itself.
use strict;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
sub new
{
diff --git a/perl/modules/Jabber/lib/XML/Stream/Tree.pm b/perl/modules/Jabber/lib/XML/Stream/Tree.pm
index b52269c..16bd35d 100644
--- a/perl/modules/Jabber/lib/XML/Stream/Tree.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/Tree.pm
@@ -63,6 +63,8 @@ Larry and Clark.
By Ryan Eatmon in March 2001 for http://jabber.org/
+Currently maintained by Darian Anthony Patrick.
+
=head1 COPYRIGHT
This module is free software; you can redistribute it and/or modify
@@ -72,7 +74,7 @@ it under the same terms as Perl itself.
use vars qw( $VERSION $LOADED );
-$VERSION = "1.22";
+$VERSION = "1.23";
$LOADED = 1;
##############################################################################
diff --git a/perl/modules/Jabber/lib/XML/Stream/XPath.pm b/perl/modules/Jabber/lib/XML/Stream/XPath.pm
index 164a7a7..6271f34 100644
--- a/perl/modules/Jabber/lib/XML/Stream/XPath.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/XPath.pm
@@ -22,11 +22,11 @@
package XML::Stream::XPath;
-use 5.006_001;
+use 5.008;
use strict;
use vars qw( $VERSION %FUNCTIONS );
-$VERSION = "1.22";
+$VERSION = "1.23";
use XML::Stream::XPath::Value;
use XML::Stream::XPath::Op;
diff --git a/perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm b/perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm
index 4209a5c..41d939b 100644
--- a/perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/XPath/Op.pm
@@ -28,11 +28,11 @@
##############################################################################
package XML::Stream::XPath::Op;
-use 5.006_001;
+use 5.008;
use strict;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
sub new
{
diff --git a/perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm b/perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm
index c4831fe..8270969 100644
--- a/perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/XPath/Query.pm
@@ -22,12 +22,12 @@
package XML::Stream::XPath::Query;
-use 5.006_001;
+use 5.008;
use strict;
use Carp;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
sub new
{
diff --git a/perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm b/perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm
index 425e183..09ab499 100644
--- a/perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm
+++ b/perl/modules/Jabber/lib/XML/Stream/XPath/Value.pm
@@ -22,11 +22,11 @@
package XML::Stream::XPath::Value;
-use 5.006_001;
+use 5.008;
use strict;
use vars qw( $VERSION );
-$VERSION = "1.22";
+$VERSION = "1.23";
sub new
{
--
1.7.1
