OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es

[Pyukiwiki-cvs 0008049] CVS update: PyukiWiki-Devel-UTF8/lib/Nana

Back to archive index

PyukiWiki CVS Commit pyuki****@lists*****
2012年 3月 12日 (月) 00:42:32 JST 

Index: PyukiWiki-Devel-UTF8/lib/Nana/Cache.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Cache.pm:1.309 PyukiWiki-Devel-UTF8/lib/Nana/Cache.pm:1.310
--- PyukiWiki-Devel-UTF8/lib/Nana/Cache.pm:1.309	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Cache.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Cache.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Cache.pm,v 1.309 2012/03/08 12:50:36 papu Exp $
+# $Id: Cache.pm,v 1.310 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Cache" version 0.2 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/File.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/File.pm:1.306 PyukiWiki-Devel-UTF8/lib/Nana/File.pm:1.307
--- PyukiWiki-Devel-UTF8/lib/Nana/File.pm:1.306	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/File.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # File.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: File.pm,v 1.306 2012/03/08 12:50:36 papu Exp $
+# $Id: File.pm,v 1.307 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::File" version 0.1 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/GZIP.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/GZIP.pm:1.208 PyukiWiki-Devel-UTF8/lib/Nana/GZIP.pm:1.209
--- PyukiWiki-Devel-UTF8/lib/Nana/GZIP.pm:1.208	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/GZIP.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # GZIP.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: GZIP.pm,v 1.208 2012/03/08 12:50:36 papu Exp $
+# $Id: GZIP.pm,v 1.209 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::GZIP" version 0.2 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/HTTP.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/HTTP.pm:1.306 PyukiWiki-Devel-UTF8/lib/Nana/HTTP.pm:1.307
--- PyukiWiki-Devel-UTF8/lib/Nana/HTTP.pm:1.306	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/HTTP.pm	Mon Mar 12 00:42:32 2012
@@ -1,8 +1,8 @@
 ######################################################################
 # HTTP.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: HTTP.pm,v 1.306 2012/03/08 12:50:36 papu Exp $
+# $Id: HTTP.pm,v 1.307 2012/03/11 15:42:32 papu Exp $
 #
-# "Nana::HTTP" version 0.6 $$
+# "Nana::HTTP" version 0.7 $$
 # Author: Nanami
 # http://nanakochi.daiba.cx/
 # Copyright (C) 2004-2012 Nekyo
@@ -28,7 +28,7 @@
 use HTTP::Lite;
 
 use vars qw($VERSION);
-$VERSION = '0.6';
+$VERSION = '0.7';
 
 # 0:付属エンジン(HTTP::Lite) 1:LWPが存在すればLWP、なければ付属エンジン
 $Nana::HTTP::useLWP=0;
@@ -164,31 +164,47 @@
 		$ua=$self{ua};
 	}
 	return "$::package/$::version ($::basehref $ua)";
-}
 
+}
 
 sub httpcl {
 	my($url,$method,$header,$postdata)=@_;
-	my $http=new HTTP::Lite;
-	$method="GET" if($method eq '');
-	$http->method($method);
-	$http->http11_mode(1);
-	foreach(split(/\n/,$header)) {
-		my($hn,$hv)=split(/:\s/,$_);
-		$http->add_req_header($hn,$hv) if($_=~/:/);
-	}
-	if($::proxy_host ne '' && $::proxy_port > 0) {
-		$http->proxy("http://$::proxy_host:$::proxy_port");
-	}
-	if($postdata ne '') {
-		$http->prepare_post($postdata);
-	}
-	my $req=$http->request($url);
-	if($req eq 200) {
-		return(0,$http->body());
-	} else {
-		return(1,"Error $req");
+	my $stat;
+	my $body;
+	eval {
+		local $SIG{ALRM}=sub { die "timeout" };
+		alarm($Nana::HTTP::timeout);
+		my $http=new HTTP::Lite;
+		$method="GET" if($method eq '');
+		$http->method($method);
+		$http->http11_mode(1);
+		foreach(split(/\n/,$header)) {
+			my($hn,$hv)=split(/:\s/,$_);
+			$http->add_req_header($hn,$hv) if($_=~/:/);
+		}
+		if($::proxy_host ne '' && $::proxy_port > 0) {
+			$http->proxy("http://$::proxy_host:$::proxy_port");
+		}
+		if($postdata ne '') {
+			$http->prepare_post($postdata);
+		}
+		my $req=$http->request($url);
+		if($req eq 200) {
+			$stat=0;
+			$body=$http->body();
+		} else {
+			$stat=1;
+			$body="Error $req";
+		}
+		alarm 0;
+	};
+	alarm 0;
+	if($@) {
+		if($@=~/timeout/) {
+			return(1,"Timeout $url");
+		}
 	}
+	return($stat,$body);
 }
 1;
 __END__
Index: PyukiWiki-Devel-UTF8/lib/Nana/Lock.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Lock.pm:1.306 PyukiWiki-Devel-UTF8/lib/Nana/Lock.pm:1.307
--- PyukiWiki-Devel-UTF8/lib/Nana/Lock.pm:1.306	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Lock.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Lock.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Lock.pm,v 1.306 2012/03/08 12:50:36 papu Exp $
+# $Id: Lock.pm,v 1.307 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Lock" version 0.2 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/Logs.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Logs.pm:1.164 PyukiWiki-Devel-UTF8/lib/Nana/Logs.pm:1.165
--- PyukiWiki-Devel-UTF8/lib/Nana/Logs.pm:1.164	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Logs.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Logs.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Logs.pm,v 1.164 2012/03/08 12:50:36 papu Exp $
+# $Id: Logs.pm,v 1.165 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Logs" version 0.2 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/MD5.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/MD5.pm:1.16 PyukiWiki-Devel-UTF8/lib/Nana/MD5.pm:1.17
--- PyukiWiki-Devel-UTF8/lib/Nana/MD5.pm:1.16	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/MD5.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # MD5.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: MD5.pm,v 1.16 2012/03/08 12:50:36 papu Exp $
+# $Id: MD5.pm,v 1.17 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::MD5" version 0.1 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/Mail.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Mail.pm:1.307 PyukiWiki-Devel-UTF8/lib/Nana/Mail.pm:1.308
--- PyukiWiki-Devel-UTF8/lib/Nana/Mail.pm:1.307	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Mail.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Mail.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Mail.pm,v 1.307 2012/03/08 12:50:36 papu Exp $
+# $Id: Mail.pm,v 1.308 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Mail" version 0.4 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/Pod2Wiki.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Pod2Wiki.pm:1.306 PyukiWiki-Devel-UTF8/lib/Nana/Pod2Wiki.pm:1.307
--- PyukiWiki-Devel-UTF8/lib/Nana/Pod2Wiki.pm:1.306	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Pod2Wiki.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Pod2Wiki.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Pod2Wiki.pm,v 1.306 2012/03/08 12:50:36 papu Exp $
+# $Id: Pod2Wiki.pm,v 1.307 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Pod2Wiki" version 0.1 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/Search.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Search.pm:1.308 PyukiWiki-Devel-UTF8/lib/Nana/Search.pm:1.309
--- PyukiWiki-Devel-UTF8/lib/Nana/Search.pm:1.308	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Search.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # Search.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: Search.pm,v 1.308 2012/03/08 12:50:36 papu Exp $
+# $Id: Search.pm,v 1.309 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::Search" version 0.6 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/Search.pm.ja.pod
diff -u PyukiWiki-Devel-UTF8/lib/Nana/Search.pm.ja.pod:1.306 PyukiWiki-Devel-UTF8/lib/Nana/Search.pm.ja.pod:1.307
--- PyukiWiki-Devel-UTF8/lib/Nana/Search.pm.ja.pod:1.306	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/Search.pm.ja.pod	Mon Mar 12 00:42:32 2012
@@ -1,4 +1,4 @@
-#$Id: Search.pm.ja.pod,v 1.306 2012/03/08 12:50:36 papu Exp $
+#$Id: Search.pm.ja.pod,v 1.307 2012/03/11 15:42:32 papu Exp $
 
 __END__
 =encoding utf-8
Index: PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB.pm:1.307 PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB.pm:1.308
--- PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB.pm:1.307	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # YukiWikiDB.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: YukiWikiDB.pm,v 1.307 2012/03/08 12:50:36 papu Exp $
+# $Id: YukiWikiDB.pm,v 1.308 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::YukiWikiDB" version 0.6 $$
 # Author: Nanami
Index: PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB_GZIP.pm
diff -u PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB_GZIP.pm:1.212 PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB_GZIP.pm:1.213
--- PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB_GZIP.pm:1.212	Thu Mar  8 21:50:36 2012
+++ PyukiWiki-Devel-UTF8/lib/Nana/YukiWikiDB_GZIP.pm	Mon Mar 12 00:42:32 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # YukiWikiDB_GZIP.pm - This is PyukiWiki, yet another Wiki clone.
-# $Id: YukiWikiDB_GZIP.pm,v 1.212 2012/03/08 12:50:36 papu Exp $
+# $Id: YukiWikiDB_GZIP.pm,v 1.213 2012/03/11 15:42:32 papu Exp $
 #
 # "Nana::YukiWikiDB_GZIP" version 0.7 $$
 # Author: Nanami


Pyukiwiki-cvs メーリングリストの案内
Back to archive index