proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-03 09:58:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 401: disable connection timeout during API call processing

Browse Source 
Only enable timeouts when we really expect data to be send/received.
This commit is contained in:
Dietmar Maurer 2013-06-07 09:54:26 +02:00
parent efa6d7bcad
commit 23699d1eee
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/HTTPServer.pm
View File

@ -85,13 +85,24 @@ sub log_aborted_request {
$self->log_request($reqstate);
}
sub client_do_disconnect {
my ($self, $reqstate) = @_;
sub cleanup_reqstate {
my ($reqstate) = @_;
delete $reqstate->{log};
delete $reqstate->{request};
delete $reqstate->{proto};
delete $reqstate->{accept_gzip};
if ($reqstate->{tmpfilename}) {
unlink $reqstate->{tmpfilename};
delete $reqstate->{tmpfilename};
}
}
sub client_do_disconnect {
my ($self, $reqstate) = @_;
cleanup_reqstate($reqstate);
my $hdl = delete $reqstate->{hdl};
@ -117,15 +128,7 @@ sub finish_response {
my $hdl = $reqstate->{hdl};
delete $reqstate->{log};
delete $reqstate->{request};
delete $reqstate->{proto};
delete $reqstate->{accept_gzip};
if ($reqstate->{tmpfilename}) {
unlink $reqstate->{tmpfilename};
delete $reqstate->{tmpfilename};
}
cleanup_reqstate($reqstate);
if (!$self->{end_loop} && $reqstate->{keep_alive} > 0) {
# print "KEEPALIVE $reqstate->{keep_alive}\n" if $self->{debug};
@ -148,6 +151,10 @@ sub response {
#print "$$: send response: " . Dumper($resp);
# activate timeout
$reqstate->{hdl}->timeout_reset();
$reqstate->{hdl}->timeout($self->{timeout});
$nocomp = 1 if !$reqstate->{accept_gzip};
my $code = $resp->code;
@ -432,6 +439,8 @@ sub handle_api2_request {
my $res = PVE::REST::rest_handler($rpcenv, $clientip, $method, $rel_uri, $auth, $params);
AnyEvent->now_update(); # in case somebody called sleep()
$rpcenv->set_user(undef); # clear after request
if ($res->{proxy}) {
@ -469,6 +478,10 @@ sub handle_request {
my $r = $reqstate->{request};
my $method = $r->method();
my $path = $r->uri->path();
# disable timeout on handle (we already have all data we need)
# we re-enable timeout in response()
$reqstate->{hdl}->timeout(0);
if ($path =~ m!$baseuri!) {
$self->handle_api2_request($reqstate, $auth);