6.05 bump
This commit is contained in:
parent
44c10702d8
commit
6297414a3b
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ libwww-perl-5.834.tar.gz
|
|||||||
/libwww-perl-6.02.tar.gz
|
/libwww-perl-6.02.tar.gz
|
||||||
/libwww-perl-6.03.tar.gz
|
/libwww-perl-6.03.tar.gz
|
||||||
/libwww-perl-6.04.tar.gz
|
/libwww-perl-6.04.tar.gz
|
||||||
|
/libwww-perl-6.05.tar.gz
|
||||||
|
@ -1,75 +0,0 @@
|
|||||||
From 6794fa73e92d63e973b38f97299b4181bdd7ee8b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Gisle Aas <gisle@aas.no>
|
|
||||||
Date: Thu, 8 Nov 2012 21:07:33 +0100
|
|
||||||
Subject: [PATCH] With Net::HTTP 6.04 we don't need our own can_read() and
|
|
||||||
sysread override
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.PL | 2 +-
|
|
||||||
lib/LWP/Protocol/http.pm | 37 -------------------------------------
|
|
||||||
2 files changed, 1 insertion(+), 38 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.PL b/Makefile.PL
|
|
||||||
index a6f808e..87075b4 100644
|
|
||||||
--- a/Makefile.PL
|
|
||||||
+++ b/Makefile.PL
|
|
||||||
@@ -61,7 +61,7 @@ WriteMakefile(
|
|
||||||
'LWP::MediaTypes' => 6,
|
|
||||||
'MIME::Base64' => "2.1",
|
|
||||||
'Net::FTP' => "2.58",
|
|
||||||
- 'Net::HTTP' => 6,
|
|
||||||
+ 'Net::HTTP' => "6.04",
|
|
||||||
'URI' => "1.10",
|
|
||||||
'URI::Escape' => 0,
|
|
||||||
'WWW::RobotRules' => 6,
|
|
||||||
diff --git a/lib/LWP/Protocol/http.pm b/lib/LWP/Protocol/http.pm
|
|
||||||
index 8d7c6d9..d0583d4 100644
|
|
||||||
--- a/lib/LWP/Protocol/http.pm
|
|
||||||
+++ b/lib/LWP/Protocol/http.pm
|
|
||||||
@@ -446,43 +446,6 @@ sub request
|
|
||||||
#-----------------------------------------------------------
|
|
||||||
package LWP::Protocol::http::SocketMethods;
|
|
||||||
|
|
||||||
-sub sysread {
|
|
||||||
- my $self = shift;
|
|
||||||
- if (my $timeout = ${*$self}{io_socket_timeout}) {
|
|
||||||
- die "read timeout" unless $self->can_read($timeout);
|
|
||||||
- }
|
|
||||||
- else {
|
|
||||||
- # since we have made the socket non-blocking we
|
|
||||||
- # use select to wait for some data to arrive
|
|
||||||
- $self->can_read(undef) || die "Assert";
|
|
||||||
- }
|
|
||||||
- sysread($self, $_[0], $_[1], $_[2] || 0);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
-sub can_read {
|
|
||||||
- my($self, $timeout) = @_;
|
|
||||||
- my $fbits = '';
|
|
||||||
- vec($fbits, fileno($self), 1) = 1;
|
|
||||||
- SELECT:
|
|
||||||
- {
|
|
||||||
- my $before;
|
|
||||||
- $before = time if $timeout;
|
|
||||||
- my $nfound = select($fbits, undef, undef, $timeout);
|
|
||||||
- if ($nfound < 0) {
|
|
||||||
- if ($!{EINTR} || $!{EAGAIN}) {
|
|
||||||
- # don't really think EAGAIN can happen here
|
|
||||||
- if ($timeout) {
|
|
||||||
- $timeout -= time - $before;
|
|
||||||
- $timeout = 0 if $timeout < 0;
|
|
||||||
- }
|
|
||||||
- redo SELECT;
|
|
||||||
- }
|
|
||||||
- die "select failed: $!";
|
|
||||||
- }
|
|
||||||
- return $nfound > 0;
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
sub ping {
|
|
||||||
my $self = shift;
|
|
||||||
!$self->can_read(0);
|
|
||||||
--
|
|
||||||
1.8.1.4
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
|||||||
Name: perl-libwww-perl
|
Name: perl-libwww-perl
|
||||||
Version: 6.04
|
Version: 6.05
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A Perl interface to the World-Wide Web
|
Summary: A Perl interface to the World-Wide Web
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
License: GPL+ or Artistic
|
License: GPL+ or Artistic
|
||||||
URL: http://search.cpan.org/dist/libwww-perl/
|
URL: http://search.cpan.org/dist/libwww-perl/
|
||||||
Source0: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
|
Source0: http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-%{version}.tar.gz
|
||||||
# Fix time-out, bug #919448, CPAN RT#81799, in upstream after 6.04
|
|
||||||
Patch0: libwww-perl-6.04-With-Net-HTTP-6.04-we-don-t-need-our-own-can_read-an.patch
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: perl(Digest::MD5)
|
BuildRequires: perl(Digest::MD5)
|
||||||
BuildRequires: perl(Encode) >= 2.12
|
BuildRequires: perl(Encode) >= 2.12
|
||||||
@ -84,7 +82,6 @@ use and even classes that help you implement simple HTTP servers.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n libwww-perl-%{version}
|
%setup -q -n libwww-perl-%{version}
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Install the aliases by default
|
# Install the aliases by default
|
||||||
@ -110,6 +107,9 @@ make test
|
|||||||
%{_mandir}/man3/*.3*
|
%{_mandir}/man3/*.3*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 12 2013 Petr Pisar <ppisar@redhat.com> - 6.05-1
|
||||||
|
- 6.05 bump
|
||||||
|
|
||||||
* Fri Mar 08 2013 Petr Pisar <ppisar@redhat.com> - 6.04-5
|
* Fri Mar 08 2013 Petr Pisar <ppisar@redhat.com> - 6.04-5
|
||||||
- Honor time-out (bug #919448)
|
- Honor time-out (bug #919448)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user