[libanyevent-rabbitmq-perl] 85/151: Merge remote-tracking branch 'plu/master'

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to annotated tag debian/1.12-1
in repository libanyevent-rabbitmq-perl.

commit a4607386e450cdd857ade90ba28bcc54aa514177
Merge: e6ed54e db64419
Author: cooldaemon <cooldaemon at gmail.com>
Date:   Tue Apr 5 17:13:03 2011 +0900

    Merge remote-tracking branch 'plu/master'
    
    Conflicts:
    	lib/AnyEvent/RabbitMQ.pm
    	lib/AnyEvent/RabbitMQ/Channel.pm

 Changes                             |  5 ++++
 Makefile.PL                         |  3 ++-
 lib/AnyEvent/RabbitMQ.pm            | 30 +++++++++++++----------
 lib/AnyEvent/RabbitMQ/Channel.pm    | 36 +++++++++++++++++++++-------
 lib/AnyEvent/RabbitMQ/LocalQueue.pm |  2 +-
 lib/Net/RabbitFoot.pm               | 10 +++++---
 lib/Net/RabbitFoot/Channel.pm       |  4 ++--
 xt/04_anyevent.t                    | 48 ++++++++++++++++++++++++++++++++++++-
 8 files changed, 108 insertions(+), 30 deletions(-)

diff --cc Changes
index 2456722,4060afb..715b48c
--- a/Changes
+++ b/Changes
@@@ -1,7 -1,11 +1,12 @@@
  Revision history for Perl extension RabbitFoot
  
 +        - Avoid (additional) issues when in global destruction.
          - Do not set reply_to to an empty string in the header frame.
+         - Implement basic.reject (requires RabbitMQ >= 2.0.0).
+         - Store server properties in the object for easy server product
+           and sever version access.
+         - Shutdown the AnyEvent handle using push_shutdown.
+         - Be more careful in DESTROY blocks.
  
  1.02    Wed Jun 30 11:35:32 2010
          - Fix errors in global destruction due to destruction order being
diff --cc lib/AnyEvent/RabbitMQ.pm
index c428f37,d2599fa..340c38e
--- a/lib/AnyEvent/RabbitMQ.pm
+++ b/lib/AnyEvent/RabbitMQ.pm
@@@ -16,20 -15,17 +16,21 @@@ use Net::AMQP::Common qw(:all)
  use AnyEvent::RabbitMQ::Channel;
  use AnyEvent::RabbitMQ::LocalQueue;
  
 +use Devel::GlobalDestruction;
 +use namespace::clean;
 +
- our $VERSION = '1.02';
+ our $VERSION = '1.03';
  
  sub new {
      my $class = shift;
      return bless {
-         verbose     => 0,
+         verbose            => 0,
          @_,
-         _is_open    => 0,
-         _queue      => AnyEvent::RabbitMQ::LocalQueue->new,
-         _channels   => {},
-         _login_user => '',
+         _is_open           => 0,
+         _queue             => AnyEvent::RabbitMQ::LocalQueue->new,
+         _channels          => {},
++        _login_user        => '',
+         _server_properties => {},
      }, $class;
  }
  
diff --cc lib/AnyEvent/RabbitMQ/Channel.pm
index ed44d25,a7b9172..64df547
--- a/lib/AnyEvent/RabbitMQ/Channel.pm
+++ b/lib/AnyEvent/RabbitMQ/Channel.pm
@@@ -324,14 -324,14 +324,14 @@@ sub _header 
                  headers          => {},
                  delivery_mode    => 1,
                  priority         => 1,
-                 correlation_id   => '',
-                 expiration       => '',
-                 message_id       => '',
+                 correlation_id   => undef,
+                 expiration       => undef,
+                 message_id       => undef,
                  timestamp        => time,
-                 type             => '',
+                 type             => undef,
 -                user_id          => undef,
 +                user_id          => $self->{connection}->login_user,
-                 app_id           => '',
-                 cluster_id       => '',
+                 app_id           => undef,
+                 cluster_id       => undef,
                  %$args,
              ),
          ),
diff --cc lib/Net/RabbitFoot/Channel.pm
index d6a379f,f2fc6f1..771d78e
--- a/lib/Net/RabbitFoot/Channel.pm
+++ b/lib/Net/RabbitFoot/Channel.pm
@@@ -3,10 -3,12 +3,10 @@@ package Net::RabbitFoot::Channel
  use strict;
  use warnings;
  
 -use Coro;
 -use Coro::AnyEvent;
 -
 +use AnyEvent;
  use AnyEvent::RabbitMQ::Channel;
  
- our $VERSION = '1.02';
+ our $VERSION = '1.03';
  
  BEGIN {
      for my $method (qw(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libanyevent-rabbitmq-perl.git