version 1.11, 2006/08/21 15:21:31
|
version 1.13, 2007/04/26 01:18:47
|
Line 37 use CGI::Cookie();
|
Line 37 use CGI::Cookie();
|
sub update_filename { |
sub update_filename { |
my ($r,$filename) = @_; |
my ($r,$filename) = @_; |
my $oldfile = $r->filename($filename); |
my $oldfile = $r->filename($filename); |
if ($ENV{'MOD_PERL_API_VERSION'} == 2) { |
if ($ENV{'MOD_PERL_API_VERSION'} == 2 |
require APR::Finfo; |
&& -e $filename) { |
require APR::Const; |
eval { |
$r->finfo(APR::Finfo::stat($filename, |
require APR::Finfo; |
&APR::Const::FINFO_NORM(), |
require APR::Const; |
$r->pool)); |
$r->finfo(APR::Finfo::stat($filename, |
|
&APR::Const::FINFO_NORM(), |
|
$r->pool)); |
|
}; |
|
if ($@) { |
|
return $@; |
|
} |
} |
} |
return $oldfile; |
return; |
} |
} |
|
|
sub handler { |
sub handler { |
Line 56 sub handler {
|
Line 62 sub handler {
|
if ($filename=~/\/$/) { return OK; } |
if ($filename=~/\/$/) { return OK; } |
if (-e "$filename.in.transfer") { |
if (-e "$filename.in.transfer") { |
sleep 10; |
sleep 10; |
&update_filename($r,$filename); |
if (-e $filename) { |
if (-e $r->finfo) { |
my $error = &update_filename($r,$filename); |
return OK; |
if ($error) { |
|
$r->log_reason('Update filename failed '.$error); |
|
return HTTP_SERVICE_UNAVAILABLE; |
|
} |
|
return OK; |
} else { |
} else { |
$r->log_reason("Waiting for file transfer timed out",$filename); |
$r->log_reason("Waiting for file transfer timed out",$filename); |
return HTTP_SERVICE_UNAVAILABLE; |
return HTTP_SERVICE_UNAVAILABLE; |
} |
} |
} else { |
} else { |
my $response=Apache::lonnet::repcopy($filename); |
my $response=&Apache::lonnet::repcopy($filename); |
if ($response eq 'ok') { |
if ($response eq 'ok' && -e $filename) { |
$r->path_info(''); |
$r->path_info(''); |
&update_filename($r,$filename); |
my $error = &update_filename($r,$filename); |
|
if ($error) { |
|
$r->log_reason('Update filename failed after replication '.$error); |
|
return HTTP_SERVICE_UNAVAILABLE; |
|
} |
return OK; |
return OK; |
} |
} |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |