r69290 - in /branches/upstream/libpoe-component-client-keepalive-perl/current: CHANGES META.yml Makefile.PL README README.mkdn dist.ini lib/POE/Component/Client/Keepalive.pm lib/POE/Component/Connection/Keepalive.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Tue Feb 22 01:18:39 UTC 2011
Author: jawnsy-guest
Date: Tue Feb 22 01:18:32 2011
New Revision: 69290
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69290
Log:
[svn-upgrade] new version libpoe-component-client-keepalive-perl (0.2660)
Modified:
branches/upstream/libpoe-component-client-keepalive-perl/current/CHANGES
branches/upstream/libpoe-component-client-keepalive-perl/current/META.yml
branches/upstream/libpoe-component-client-keepalive-perl/current/Makefile.PL
branches/upstream/libpoe-component-client-keepalive-perl/current/README
branches/upstream/libpoe-component-client-keepalive-perl/current/README.mkdn
branches/upstream/libpoe-component-client-keepalive-perl/current/dist.ini
branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Client/Keepalive.pm
branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Connection/Keepalive.pm
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/CHANGES?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/CHANGES (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/CHANGES Tue Feb 22 01:18:32 2011
@@ -1,3 +1,32 @@
+================================
+2011-02-20 22:59:20 -0500 v0_266
+================================
+
+ commit c1bd850688769713235c2fbd5f1fc8955888b4c3
+ Author: Rocco Caputo <rcaputo at cpan.org>
+ Date: Sun Feb 20 22:59:20 2011 -0500
+
+ Remove VERSION assignment so dzil can do it for us.
+
+ commit cf949a62689bab4ac60086fbcf5335b085075e73
+ Author: Rocco Caputo <rcaputo at cpan.org>
+ Date: Sun Feb 20 22:36:47 2011 -0500
+
+ Roll back a 5.10-ism. Resolves rt.cpan.org #65837 reported by Richard
+ Harris (CPAN ID RJH).
+
+ commit ed407606caa492769140a07feda758871ca38d8d
+ Author: Rocco Caputo <rcaputo at cpan.org>
+ Date: Sun Feb 20 22:36:29 2011 -0500
+
+ This project has migrated from .releaserc to dist.ini.
+
+ commit 25ffdf7a60be1f4294c6c5d9534346ea30b31cad
+ Author: Rocco Caputo <rcaputo at cpan.org>
+ Date: Mon Feb 14 19:49:14 2011 -0500
+
+ Add for_scheme, for_addr and for_port parameters to help proxies.
+
================================
2011-01-27 13:24:53 -0500 v0_265
================================
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/META.yml?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/META.yml (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/META.yml Tue Feb 22 01:18:32 2011
@@ -15,7 +15,7 @@
requires:
Net::IP: 1.25
POE: 1.299
- POE::Component::Resolver: 0.910
+ POE::Component::Resolver: 0.911
resources:
repository: git://github.com/rcaputo/poe-component-client-keepalive.git
-version: 0.265
+version: 0.266
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/Makefile.PL?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/Makefile.PL (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/Makefile.PL Tue Feb 22 01:18:32 2011
@@ -22,9 +22,9 @@
'PREREQ_PM' => {
'Net::IP' => '1.25',
'POE' => '1.299',
- 'POE::Component::Resolver' => '0.910'
+ 'POE::Component::Resolver' => '0.911'
},
- 'VERSION' => '0.265',
+ 'VERSION' => '0.266',
'test' => {
'TESTS' => 't/*.t'
}
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/README?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/README (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/README Tue Feb 22 01:18:32 2011
@@ -2,7 +2,7 @@
POE::Component::Client::Keepalive - manage connections, with keep-alive
VERSION
- version 0.265
+ version 0.266
SYNOPSIS
use warnings;
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/README.mkdn
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/README.mkdn?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/README.mkdn (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/README.mkdn Tue Feb 22 01:18:32 2011
@@ -4,7 +4,7 @@
# VERSION
-version 0.265
+version 0.266
# SYNOPSIS
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/dist.ini
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/dist.ini?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/dist.ini (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/dist.ini Tue Feb 22 01:18:32 2011
@@ -1,5 +1,5 @@
name = POE-Component-Client-Keepalive
-version = 0.265
+version = 0.266
author = Rocco Caputo <rcaputo at cpan.org>
license = Perl_5
copyright_holder = Rocco Caputo
@@ -7,7 +7,7 @@
[Prereqs]
Net::IP = 1.25
POE = 1.299
-POE::Component::Resolver = 0.910
+POE::Component::Resolver = 0.911
[Repository]
git_remote = gh
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Client/Keepalive.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Client/Keepalive.pm?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Client/Keepalive.pm (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Client/Keepalive.pm Tue Feb 22 01:18:32 2011
@@ -1,10 +1,10 @@
package POE::Component::Client::Keepalive;
+BEGIN {
+ $POE::Component::Client::Keepalive::VERSION = '0.266';
+}
use warnings;
use strict;
-
-use vars qw($VERSION);
-$VERSION = "0.263";
use Carp qw(croak);
use Errno qw(ETIMEDOUT EBADF);
@@ -90,23 +90,26 @@
# ....
# );
- # $request = [
-use constant RQ_SESSION => 0; # $request_session,
-use constant RQ_EVENT => 1; # $request_event,
-use constant RQ_SCHEME => 2; # $request_scheme,
-use constant RQ_ADDRESS => 3; # $request_address,
-use constant RQ_IP => 4; # $request_ip,
-use constant RQ_PORT => 5; # $request_port,
-use constant RQ_CONN_KEY => 6; # $request_connection_key,
-use constant RQ_CONTEXT => 7; # $request_context,
-use constant RQ_TIMEOUT => 8; # $request_timeout,
-use constant RQ_START => 9; # $request_start_time,
-use constant RQ_TIMER_ID => 10; # $request_timer_id,
-use constant RQ_WHEEL_ID => 11; # $request_wheel_id,
-use constant RQ_ACTIVE => 12; # $request_is_active,
-use constant RQ_ID => 13; # $request_id,
-use constant RQ_ADDR_FAM => 14; # $request_address_family,
- # ];
+ # $request = [
+use constant RQ_SESSION => 0; # $request_session,
+use constant RQ_EVENT => 1; # $request_event,
+use constant RQ_SCHEME => 2; # $request_scheme,
+use constant RQ_ADDRESS => 3; # $request_address,
+use constant RQ_IP => 4; # $request_ip,
+use constant RQ_PORT => 5; # $request_port,
+use constant RQ_CONN_KEY => 6; # $request_connection_key,
+use constant RQ_CONTEXT => 7; # $request_context,
+use constant RQ_TIMEOUT => 8; # $request_timeout,
+use constant RQ_START => 9; # $request_start_time,
+use constant RQ_TIMER_ID => 10; # $request_timer_id,
+use constant RQ_WHEEL_ID => 11; # $request_wheel_id,
+use constant RQ_ACTIVE => 12; # $request_is_active,
+use constant RQ_ID => 13; # $request_id,
+use constant RQ_ADDR_FAM => 14; # $request_address_family,
+use constant RQ_FOR_SCHEME => 15; # $request_address_family,
+use constant RQ_FOR_ADDRESS => 16; # $request_address_family,
+use constant RQ_FOR_PORT => 17; # $request_address_family,
+ # ];
# Create a connection manager.
@@ -144,7 +147,7 @@
$bind_address, # SF_BIND_ADDR
], $class;
- $resolver //= POE::Component::Resolver->new();
+ $resolver ||= POE::Component::Resolver->new();
$self->[SF_RESOLVER] = $resolver;
POE::Session->create(
@@ -351,6 +354,10 @@
my $timeout = delete $args{timeout};
$timeout = $self->[SF_TIMEOUT] unless $timeout;
+ my $for_scheme = delete($args{for_scheme}) || $scheme;
+ my $for_address = delete($args{for_addr}) || $address;
+ my $for_port = delete($args{for_port}) || $port;
+
croak "allocate() on shut-down connection manager" if $self->[SF_SHUTDOWN];
my @unknown = sort keys %args;
@@ -358,7 +365,9 @@
croak "allocate() doesn't accept: @unknown";
}
- my $conn_key = "$scheme:$address:$port";
+ my $conn_key = (
+ "$scheme $address $port for $for_scheme $for_address $for_port"
+ );
# If we have a connection pool for the scheme/address/port triple,
# then we can maybe post an available connection right away.
@@ -384,20 +393,23 @@
my $request = [
$poe_kernel->get_active_session(), # RQ_SESSION
- $event, # RQ_EVENT
- $scheme, # RQ_SCHEME
- $address, # RQ_ADDRESS
- undef, # RQ_IP
- $port, # RQ_PORT
- $conn_key, # RQ_CONN_KEY
- $context, # RQ_CONTEXT
- $timeout, # RQ_TIMEOUT
- time(), # RQ_START
- undef, # RQ_TIMER_ID
- undef, # RQ_WHEEL_ID
- 1, # RQ_ACTIVE
+ $event, # RQ_EVENT
+ $scheme, # RQ_SCHEME
+ $address, # RQ_ADDRESS
+ undef, # RQ_IP
+ $port, # RQ_PORT
+ $conn_key, # RQ_CONN_KEY
+ $context, # RQ_CONTEXT
+ $timeout, # RQ_TIMEOUT
+ time(), # RQ_START
+ undef, # RQ_TIMER_ID
+ undef, # RQ_WHEEL_ID
+ 1, # RQ_ACTIVE
_allocate_req_id(), # RQ_ID
- undef, # RQ_ADDR_FAM
+ undef, # RQ_ADDR_FAM
+ $for_scheme, # RQ_FOR_SCHEME
+ $for_address, # RQ_FOR_ADDRESS
+ $for_port, # RQ_FOR_PORT
];
$self->[SF_REQ_INDEX]{$request->[RQ_ID]} = $request;
@@ -588,10 +600,10 @@
eval {
$socket = POE::Component::SSLify::Client_SSLify($socket);
};
- if ($@) {
- _respond_with_error($request, "sslify", undef, "$@");
- return;
- }
+ if ($@) {
+ _respond_with_error($request, "sslify", undef, "$@");
+ return;
+ }
}
$used->[USED_SOCKET] = $socket;
@@ -1069,10 +1081,13 @@
$request->[RQ_SESSION],
$request->[RQ_EVENT],
{
- addr => $request->[RQ_ADDRESS],
- context => $request->[RQ_CONTEXT],
- port => $request->[RQ_PORT],
- scheme => $request->[RQ_SCHEME],
+ addr => $request->[RQ_ADDRESS],
+ context => $request->[RQ_CONTEXT],
+ port => $request->[RQ_PORT],
+ scheme => $request->[RQ_SCHEME],
+ for_addr => $request->[RQ_FOR_ADDRESS],
+ for_scheme => $request->[RQ_FOR_SCHEME],
+ for_port => $request->[RQ_FOR_PORT],
%$fields,
}
);
@@ -1103,7 +1118,7 @@
=head1 VERSION
-version 0.265
+version 0.266
=head1 SYNOPSIS
Modified: branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Connection/Keepalive.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Connection/Keepalive.pm?rev=69290&op=diff
==============================================================================
--- branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Connection/Keepalive.pm (original)
+++ branches/upstream/libpoe-component-client-keepalive-perl/current/lib/POE/Component/Connection/Keepalive.pm Tue Feb 22 01:18:32 2011
@@ -3,12 +3,12 @@
# when it's destroyed.
package POE::Component::Connection::Keepalive;
+BEGIN {
+ $POE::Component::Connection::Keepalive::VERSION = '0.266';
+}
use warnings;
use strict;
-
-use vars qw($VERSION);
-$VERSION = "0.262";
use Carp qw(croak);
use POE::Wheel::ReadWrite;
@@ -102,7 +102,7 @@
=head1 VERSION
-version 0.265
+version 0.266
POE::Component::Connection::Keepalive - a wheel wrapper around a
kept-alive socket
More information about the Pkg-perl-cvs-commits
mailing list