r50532 - in /trunk/libxml-stream-perl: ./ debian/ lib/XML/ lib/XML/Stream/ lib/XML/Stream/IO/ lib/XML/Stream/Parser/ lib/XML/Stream/XPath/ t/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Fri Jan 8 15:54:15 UTC 2010


Author: jawnsy-guest
Date: Fri Jan  8 15:53:48 2010
New Revision: 50532

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50532
Log:
* New upstream release
* Update copyright information and clauses

Added:
    trunk/libxml-stream-perl/SIGNATURE
      - copied unchanged from r50531, branches/upstream/libxml-stream-perl/current/SIGNATURE
    trunk/libxml-stream-perl/lib/XML/Stream/IO/
      - copied from r50531, branches/upstream/libxml-stream-perl/current/lib/XML/Stream/IO/
    trunk/libxml-stream-perl/t/0-signature.t
      - copied unchanged from r50531, branches/upstream/libxml-stream-perl/current/t/0-signature.t
    trunk/libxml-stream-perl/t/cdata.t
      - copied unchanged from r50531, branches/upstream/libxml-stream-perl/current/t/cdata.t
    trunk/libxml-stream-perl/t/quotes.t
      - copied unchanged from r50531, branches/upstream/libxml-stream-perl/current/t/quotes.t
Removed:
    trunk/libxml-stream-perl/MANIFEST.SKIP
Modified:
    trunk/libxml-stream-perl/CHANGES
    trunk/libxml-stream-perl/MANIFEST
    trunk/libxml-stream-perl/META.yml
    trunk/libxml-stream-perl/Makefile.PL
    trunk/libxml-stream-perl/README
    trunk/libxml-stream-perl/debian/changelog
    trunk/libxml-stream-perl/debian/copyright
    trunk/libxml-stream-perl/lib/XML/Stream.pm
    trunk/libxml-stream-perl/lib/XML/Stream/Namespace.pm
    trunk/libxml-stream-perl/lib/XML/Stream/Node.pm
    trunk/libxml-stream-perl/lib/XML/Stream/Parser.pm
    trunk/libxml-stream-perl/lib/XML/Stream/Parser/DTD.pm
    trunk/libxml-stream-perl/lib/XML/Stream/Tree.pm
    trunk/libxml-stream-perl/lib/XML/Stream/XPath.pm
    trunk/libxml-stream-perl/lib/XML/Stream/XPath/Op.pm
    trunk/libxml-stream-perl/lib/XML/Stream/XPath/Query.pm
    trunk/libxml-stream-perl/lib/XML/Stream/XPath/Value.pm
    trunk/libxml-stream-perl/t/tcpip.t
    trunk/libxml-stream-perl/t/tcpip2ssl.t

Modified: trunk/libxml-stream-perl/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/CHANGES?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/CHANGES (original)
+++ trunk/libxml-stream-perl/CHANGES Fri Jan  8 15:53:48 2010
@@ -1,3 +1,16 @@
+1.23
+====
+  - RT#17484 Handle servers which re-use stream ID 
+  - RT#18711 Update link to XML Streams doc 
+  - RT#12977 Require perl >= 5.8.0
+  - RT#19415 Use jabber.org for tests
+  - RT#21932 Fix authname for Google Talk SASL auth
+  - RT#39098 Make dependencies more explicit
+  - RT#24817 Merge and massage of toddr's SASL fix
+  - RT#36864 Fake select on filehandles on win32
+  - RT#31215 Test and fix for XML node copying issue
+  - RT#17325 Fix and test for infinite loop on quotes
+
 1.22
 ====
   - Using Encode module to handle utf encoding and decoding.  I cannot

Modified: trunk/libxml-stream-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/MANIFEST?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/MANIFEST (original)
+++ trunk/libxml-stream-perl/MANIFEST Fri Jan  8 15:53:48 2010
@@ -1,13 +1,9 @@
 CHANGES
-README
 INFO
-LICENSE.LGPL
-MANIFEST
-MANIFEST.SKIP
-Makefile.PL
 lib/XML/Stream.pm
+lib/XML/Stream/IO/Select/Win32.pm
+lib/XML/Stream/Namespace.pm
 lib/XML/Stream/Node.pm
-lib/XML/Stream/Namespace.pm
 lib/XML/Stream/Parser.pm
 lib/XML/Stream/Parser/DTD.pm
 lib/XML/Stream/Tree.pm
@@ -15,16 +11,24 @@
 lib/XML/Stream/XPath/Op.pm
 lib/XML/Stream/XPath/Query.pm
 lib/XML/Stream/XPath/Value.pm
+LICENSE.LGPL
+Makefile.PL
+MANIFEST			This list of files
+META.yml
+README
+t/0-signature.t
 t/buildxml.t
+t/cdata.t
 t/lib/Test/Builder.pm
 t/lib/Test/More.pm
 t/lib/Test/Simple.pm
 t/load.t
 t/parse_node.t
 t/parse_tree.t
+t/quotes.t
 t/tcpip.t
 t/tcpip2ssl.t
 t/test.xml
 t/xml2config.t
 t/xpath.t
-META.yml                                 Module meta-data (added by MakeMaker)
+SIGNATURE                                Public-key signature (added by MakeMaker)

Modified: trunk/libxml-stream-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/META.yml?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/META.yml (original)
+++ trunk/libxml-stream-perl/META.yml Fri Jan  8 15:53:48 2010
@@ -1,12 +1,35 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         XML-Stream
-version:      1.22
-version_from: lib/XML/Stream.pm
-installdirs:  site
+--- #YAML:1.0
+name:               XML-Stream
+version:            1.23
+abstract:           Creates an XML Stream connection and parses return data
+author:
+    - Darian Anthony Patrick <dapatrick at cpan.org>
+license:            LGPL
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
 requires:
-    Authen::SASL:                  0
-    MIME::Base64:                  0
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+    Authen::SASL:   0
+    Carp:           0
+    Encode:         0
+    FileHandle:     0
+    IO::Select:     0
+    IO::Socket:     0
+    MIME::Base64:   0
+    perl:           5.008
+    POSIX:          0
+    Sys::Hostname:  0
+    utf8:           0
+resources:
+    bugtracker:  https://rt.cpan.org/Dist/Display.html?Queue=XML-Stream
+    repository:  http://github.com/dap/XML-Stream
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.56
+meta-spec:
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: trunk/libxml-stream-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/Makefile.PL?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/Makefile.PL (original)
+++ trunk/libxml-stream-perl/Makefile.PL Fri Jan  8 15:53:48 2010
@@ -1,15 +1,31 @@
-use 5.006_001;
+use 5.008_000;
 use ExtUtils::MakeMaker;
 
 WriteMakefile(
-    'NAME'  => 'XML::Stream',
-    'VERSION_FROM' => 'lib/XML/Stream.pm',
-    'PREREQ_PM' => {
-        'Authen::SASL' => 0,
-        'MIME::Base64' => 0,
+    (MM->can('signature_target') ? (SIGN => 1) : ()),
+    'NAME'             => 'XML::Stream',
+    'VERSION_FROM'     => 'lib/XML/Stream.pm',
+    'ABSTRACT_FROM'    => 'lib/XML/Stream.pm',
+    'AUTHOR'           => 'Darian Anthony Patrick <dapatrick at cpan.org>',
+    'LICENSE'          => 'LGPL',
+    'MIN_PERL_VERSION' => '5.008',
+    'PREREQ_PM'        => {
+        'Authen::SASL'  => 0,
+        'MIME::Base64'  => 0,
+        'Sys::Hostname' => 0,
+        'IO::Socket'    => 0,
+        'IO::Select'    => 0,
+        'FileHandle'    => 0,
+        'Carp'          => 0,
+        'POSIX'         => 0,
+        'utf8'          => 0,
+        'Encode'        => 0,
     },
-    'dist' => {
-        'COMPRESS' => 'gzip --best'
-    }
+    'META_MERGE'       => {
+        'resources' => {
+            'bugtracker' => 'https://rt.cpan.org/Dist/Display.html?Queue=XML-Stream',
+            'repository' => 'http://github.com/dap/XML-Stream',
+        }
+    },
 );
 

Modified: trunk/libxml-stream-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/README?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/README (original)
+++ trunk/libxml-stream-perl/README Fri Jan  8 15:53:48 2010
@@ -1,14 +1,14 @@
-XML::Stream v1.22
+XML::Stream v1.23_01 2009-12-31
 
 This module provides you with access to XML Streams.  An XML Stream
 is just that.  A stream of XML over a connection between two computers.
 For more information about XML Streams, and the group that created them,
 please visit:
 
-http://etherx.jabber.org/streams
+http://xmpp.org/protocols/streams/
 
-Ryan Eatmon
-reatmon at jabber.org
+Darian Anthony Patrick
+dapatrick at cpan.org
 
 
 INSTALLATION
@@ -28,11 +28,6 @@
   IO::Socket::SSL v0.81 - Module to enable TLS for XML::Stream.
   Net::DNS              - Enables access to SRV records.
 
-STATUS
+Please submit bug reports at
+http://rt.cpan.org/Public/Bug/Report.html?Queue=XML-Stream
 
-    Initial support added for XMPP 1.0.  This release may not be stable.  If
-you run into problems, downgrade to 1.21.
-
-Please send any bug reports to reatmon at jabber.org.
-2004/08/22
-

Modified: trunk/libxml-stream-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/changelog?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/changelog (original)
+++ trunk/libxml-stream-perl/debian/changelog Fri Jan  8 15:53:48 2010
@@ -1,3 +1,10 @@
+libxml-stream-perl (1.23-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Update copyright information and clauses
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Fri, 08 Jan 2010 10:51:36 -0500
+
 libxml-stream-perl (1.22-4) unstable; urgency=low
 
   [ gregor herrmann ]

Modified: trunk/libxml-stream-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/copyright?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/copyright (original)
+++ trunk/libxml-stream-perl/debian/copyright Fri Jan  8 15:53:48 2010
@@ -1,50 +1,50 @@
 Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: Ryan Eatmon
+Maintainer: Darian Anthony Patrick <dapatrick at cpan.org>
 Source: http://search.cpan.org/dist/XML-Stream/
 Name: XML-Stream
 
 Files: *
-Copyright: © 1998-2004, Jabber Software Foundation http://jabber.org/
+Copyright: 1998-2004, Jabber Software Foundation <http://jabber.org/>
 License: GPL-2+
 
 Files: t/lib/Test/Builder.pm
-Copyright: © 2002, chromatic <chromatic at wgz.org>
- © 2002, Michael G Schwern <schwern at pobox.com>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2002, chromatic <chromatic at wgz.org>
+ 2002, Michael G Schwern <schwern at pobox.com>
+License: Artistic or GPL-1+
 
 Files: t/lib/Test/Simple.pm, t/lib/Test/More.pm
-Copyright: © 2001, Michael G Schwern <schwern at pobox.com>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2001, Michael G Schwern <schwern at pobox.com>
+License: Artistic or GPL-1+
 
 Files: debian/*
-Copyright:
- © 2000-2003, Ardo van Rangelrooij <ardo at debian.org>
- © 2004-2007, Jay Bonci <jaybonci at debian.org>
- © 2007,      Andreas Barth <aba at not.so.argh.org>
- © 2010,      Ansgar Burchardt <ansgar at 43-1.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2010, Jonathan Yu <jawnsy at cpan.org>
+ 2010, Ansgar Burchardt <ansgar at 43-1.org>
+ 2007, Andreas Barth <aba at not.so.argh.org>
+ 2004-2007, Jay Bonci <jaybonci at debian.org>
+ 2000-2003, Ardo van Rangelrooij <ardo at debian.org>
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
 
 License: GPL-1+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
 
 License: GPL-2+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'

Modified: trunk/libxml-stream-perl/lib/XML/Stream.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream.pm Fri Jan  8 15:53:48 2010
@@ -24,7 +24,7 @@
 
 =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 @@
   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 @@
                                       "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 @@
 tcharron at 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 @@
 
 =cut
 
-use 5.006_001;
+use 5.008;
 use strict;
 use Sys::Hostname;
 use IO::Socket;
@@ -255,6 +257,7 @@
 use MIME::Base64;
 use utf8;
 use Encode;
+use XML::Stream::IO::Select::Win32;
 
 $SIG{PIPE} = "IGNORE";
 
@@ -290,7 +293,7 @@
 }
 
 
-$VERSION = "1.22";
+$VERSION = "1.23";
 $NONBLOCKING = 0;
 
 use XML::Stream::Namespace;
@@ -680,7 +683,7 @@
         $self->debug(1,"Connect: srv requested");
         if ($NETDNS)
         {
-            my $res = new Net::DNS::Resolver();
+            my $res = Net::DNS::Resolver->new();
             my $query = $res->query($self->{SIDS}->{newconnection}->{srv}.".".$self->{SIDS}->{newconnection}->{hostname},"SRV");
             
             if ($query)
@@ -1160,7 +1163,8 @@
         $self->{SOCKETS}->{*STDIN} = $sid;
     }
 
-    delete($self->{SIDS}->{$currsid});
+    delete($self->{SIDS}->{$currsid})
+        unless $currsid eq $sid;
 
     if (exists($self->GetRoot($sid)->{version}) &&
         ($self->GetRoot($sid)->{version} ne ""))
@@ -1210,10 +1214,24 @@
                         }
                  );
 
-    $self->{SIDS}->{newconnection}->{select} =
-        new IO::Select($self->{SIDS}->{newconnection}->{sock});
-
-    $self->{SELECT} = new IO::Select($self->{SIDS}->{newconnection}->{sock});
+    # select is not implemented for filehandles on win32 (see perlport)
+    # so we fake it out using XML::Stream::IO::Select::Win32
+    if ( $^O =~ /mswin32/i ) {
+        $self->{SIDS}->{newconnection}->{select}
+            = new XML::Stream::IO::Select::Win32(
+                $self->{SIDS}->{newconnection}->{sock});
+
+        $self->{SELECT}
+            = new XML::Stream::IO::Select::Win32(
+                $self->{SIDS}->{newconnection}->{sock});
+    }
+    else {
+        $self->{SIDS}->{newconnection}->{select}
+            = new IO::Select($self->{SIDS}->{newconnection}->{sock});
+
+        $self->{SELECT}
+            = new IO::Select($self->{SIDS}->{newconnection}->{sock});
+    }
 
     $self->{SIDS}->{newconnection}->{status} = 0;
 
@@ -2110,17 +2128,26 @@
     my $mechanisms = $self->GetStreamFeature($sid,"xmpp-sasl");
 
     return unless defined($mechanisms);
+
+    # Here we assume that if 'to' is available, then a domain is being
+    # specified that does not match the hostname of the jabber server
+    # and that we should use that to form the bare JID for SASL auth.
+    my $domain .=  $self->{SIDS}->{$sid}->{to}
+        ? $self->{SIDS}->{$sid}->{to}
+        : $self->{SIDS}->{$sid}->{hostname};
+
+    my $authname = $username . '@' . $domain;
     
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{
-                                           authname => $username."@".$self->{SIDS}->{$sid}->{hostname},
+                                           authname => $authname,
 
                                            user     => $username,
                                            pass     => $password
                                           }
                                );
 
-    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new();
+    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $domain);
     $self->{SIDS}->{$sid}->{sasl}->{username} = $username;
     $self->{SIDS}->{$sid}->{sasl}->{password} = $password;
     $self->{SIDS}->{$sid}->{sasl}->{authed} = 0;

Modified: trunk/libxml-stream-perl/lib/XML/Stream/Namespace.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/Namespace.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/Namespace.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/Namespace.pm Fri Jan  8 15:53:48 2010
@@ -85,6 +85,8 @@
 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 Carp;
 use vars qw( $VERSION );
 
-$VERSION = "1.22";
+$VERSION = "1.23";
 
 sub new
 {

Modified: trunk/libxml-stream-perl/lib/XML/Stream/Node.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/Node.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/Node.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/Node.pm Fri Jan  8 15:53:48 2010
@@ -129,6 +129,8 @@
 
 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 @@
 
 use vars qw( $VERSION $LOADED );
 
-$VERSION = "1.22";
+$VERSION = "1.23";
 $LOADED = 1;
 
 sub new
@@ -406,7 +408,7 @@
     {
         if ($child->get_tag() eq "__xmlstream__:node:cdata")
         {
-            $new_node->add_cdata($self->get_cdata());
+            $new_node->add_cdata($child->children());
         }
         else
         {

Modified: trunk/libxml-stream-perl/lib/XML/Stream/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/Parser.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/Parser.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/Parser.pm Fri Jan  8 15:53:48 2010
@@ -44,6 +44,8 @@
 
 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 @@
 use strict;
 use vars qw( $VERSION );
 
-$VERSION = "1.22";
+$VERSION = "1.23";
+
+use XML::Stream::Tree;
+use XML::Stream::Node;
 
 sub new
 {
@@ -383,10 +388,12 @@
             $ids = $id1;
             $id = "\'";
         }
-        if((($id2 < $id1) && ($id1 == -1)) || ($id2 != -1))
-        {
-            $ids = $id2;
-            $id = "\"";
+        else {
+            if((($id2 < $id1) && ($id1 == -1)) || ($id2 != -1))
+            {
+                $ids = $id2;
+                $id = "\"";
+            }
         }
 
         my $nextid = index($str,$id,$ids+1);

Modified: trunk/libxml-stream-perl/lib/XML/Stream/Parser/DTD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/Parser/DTD.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/Parser/DTD.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/Parser/DTD.pm Fri Jan  8 15:53:48 2010
@@ -44,6 +44,8 @@
 
 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 @@
 use strict;
 use vars qw( $VERSION );
 
-$VERSION = "1.22";
+$VERSION = "1.23";
 
 sub new
 {

Modified: trunk/libxml-stream-perl/lib/XML/Stream/Tree.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/Tree.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/Tree.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/Tree.pm Fri Jan  8 15:53:48 2010
@@ -63,6 +63,8 @@
 
 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 @@
 
 use vars qw( $VERSION $LOADED );
 
-$VERSION = "1.22";
+$VERSION = "1.23";
 $LOADED = 1;
 
 ##############################################################################

Modified: trunk/libxml-stream-perl/lib/XML/Stream/XPath.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/XPath.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/XPath.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/XPath.pm Fri Jan  8 15:53:48 2010
@@ -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;

Modified: trunk/libxml-stream-perl/lib/XML/Stream/XPath/Op.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/XPath/Op.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/XPath/Op.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/XPath/Op.pm Fri Jan  8 15:53:48 2010
@@ -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
 {

Modified: trunk/libxml-stream-perl/lib/XML/Stream/XPath/Query.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/XPath/Query.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/XPath/Query.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/XPath/Query.pm Fri Jan  8 15:53:48 2010
@@ -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
 {

Modified: trunk/libxml-stream-perl/lib/XML/Stream/XPath/Value.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream/XPath/Value.pm?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream/XPath/Value.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream/XPath/Value.pm Fri Jan  8 15:53:48 2010
@@ -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
 {

Modified: trunk/libxml-stream-perl/t/tcpip.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/t/tcpip.t?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/t/tcpip.t (original)
+++ trunk/libxml-stream-perl/t/tcpip.t Fri Jan  8 15:53:48 2010
@@ -9,10 +9,10 @@
 
 SKIP:
 {
-    my $sock = IO::Socket::INET->new(PeerAddr=>'obelisk.net:5222');
+    my $sock = IO::Socket::INET->new(PeerAddr=>'jabber.org:5222');
     skip "Cannot open connection (maybe a firewall?)",1 unless defined($sock);
     
-    my $status = $stream->Connect(hostname=>"obelisk.net",
+    my $status = $stream->Connect(hostname=>"jabber.org",
                                   port=>5222,
                                   namespace=>"jabber:client",
                                   connectiontype=>"tcpip",

Modified: trunk/libxml-stream-perl/t/tcpip2ssl.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/t/tcpip2ssl.t?rev=50532&op=diff
==============================================================================
--- trunk/libxml-stream-perl/t/tcpip2ssl.t (original)
+++ trunk/libxml-stream-perl/t/tcpip2ssl.t Fri Jan  8 15:53:48 2010
@@ -15,7 +15,7 @@
     SKIP:
     {
 
-        my $status = $stream->Connect(hostname=>"obelisk.net",
+        my $status = $stream->Connect(hostname=>"jabber.org",
                                       port=>5223,
                                       namespace=>"jabber:client",
                                       connectiontype=>"tcpip",




More information about the Pkg-perl-cvs-commits mailing list