SVN: toys/rsget.pl/RSGet: Captcha.pm Curl.pm HTTPServer.pm

[sparky]

Author: sparky
Date: Mon Sep 14 00:35:46 2009
New Revision: 10595

Modified:
   toys/rsget.pl/RSGet/Captcha.pm
   toys/rsget.pl/RSGet/Curl.pm
   toys/rsget.pl/RSGet/HTTPServer.pm
Log:
- fixes


Modified: toys/rsget.pl/RSGet/Captcha.pm
==============================================================================
--- toys/rsget.pl/RSGet/Captcha.pm	(original)
+++ toys/rsget.pl/RSGet/Captcha.pm	Mon Sep 14 00:35:46 2009
@@ -23,7 +23,7 @@
 
 	$self->{captcha_md5} = $md5;
 	$self->{captcha_next} = $next_stage;
-	$self->{captcha_until} = time + 100;
+	$self->{captcha_until} = time + 200;
 
 	my $id = 0;
 	++$id while exists $waiting{ $id };

Modified: toys/rsget.pl/RSGet/Curl.pm
==============================================================================
--- toys/rsget.pl/RSGet/Curl.pm	(original)
+++ toys/rsget.pl/RSGet/Curl.pm	Mon Sep 14 00:35:46 2009
@@ -149,7 +149,7 @@
 	}
 
 	my $fname;
-	if ( $supercurl->{head} =~ /^Content-Disposition:\s*attachment;\s*filename\s*=\s*"?(.+?)"?\s*$/i ) {
+	if ( $supercurl->{head} =~ /^Content-Disposition:\s*attachment;\s*filename\s*=\s*"?(.+?)"?;?\s*$/mi ) {
 		$fname = de_ml( uri_unescape( $1 ) );
 	} else {
 		my $eurl = $curl->getinfo( CURLINFO_EFFECTIVE_URL );
@@ -181,7 +181,6 @@
 			seek $f_out, $start, SEEK_SET;
 			$supercurl->{get_obj}->log( "Continuing at " . bignum( $start ) . $old_msg );
 
-
 			hadd $supercurl,
 				file => $f_out,
 				size_start => $start,

Modified: toys/rsget.pl/RSGet/HTTPServer.pm
==============================================================================
--- toys/rsget.pl/RSGet/HTTPServer.pm	(original)
+++ toys/rsget.pl/RSGet/HTTPServer.pm	Mon Sep 14 00:35:46 2009
@@ -112,8 +112,9 @@
 		print $client $print;
 		close $client;
 
-		# don't exit if we didn't actually fork
-		exit 0 if defined $kid;
+		# make sure no DESTROY blocks are called
+		require POSIX;
+		POSIX::_exit( 0 );
 	};
 
 	close $client;