Merge commit 'v7.10.24' into WebGUI8
This commit is contained in:
commit
3b418ede3c
139 changed files with 699 additions and 32133 deletions
|
|
@ -293,6 +293,7 @@ sub finish {
|
|||
$props{latch} = 0;
|
||||
}
|
||||
$props{endTime} = time();
|
||||
$props{redirect} = $self->{redirect};
|
||||
$self->set( \%props );
|
||||
}
|
||||
|
||||
|
|
@ -529,6 +530,20 @@ sub setGroup {
|
|||
|
||||
#-----------------------------------------------------------------
|
||||
|
||||
=head2 setRedirect($url)
|
||||
|
||||
Allows a redirect to be set for the process after the initial fork. This happens
|
||||
in the case when a file is to be downloaded after the fork finishes.
|
||||
|
||||
=cut
|
||||
|
||||
sub setRedirect {
|
||||
my ( $self, $url ) = @_;
|
||||
$self->{redirect} = $url;
|
||||
}
|
||||
|
||||
#-----------------------------------------------------------------
|
||||
|
||||
=head2 request ($module, $subname, $data)
|
||||
|
||||
Internal method. Generates a hashref suitable for passing to runRequest.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue