File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -72,17 +72,19 @@ sub timeout {
72
72
my $response ;
73
73
74
74
# if timeout is not defined but a value is set in the headers for timeout
75
- $timeout = vars-> {header_timeout } if (!defined $timeout && defined vars-> {header_timeout });
75
+ my $request_timeout = 0;
76
+ $request_timeout = $timeout if (defined $timeout );
77
+ $request_timeout = vars-> {header_timeout } if (!defined $timeout && defined vars-> {header_timeout });
76
78
77
79
# if timeout is not defined or equal 0 the timeout manager is not used
78
80
my $timeout_exception ;
79
- if (!$timeout ){
81
+ if (!$request_timeout ){
80
82
$response = $code -> ();
81
83
}
82
84
else {
83
85
try {
84
86
local $SIG {ALRM } = sub { croak ($exception_message ); };
85
- alarm($timeout );
87
+ alarm($request_timeout );
86
88
87
89
$response = $code -> ();
88
90
alarm(0);
@@ -96,7 +98,7 @@ sub timeout {
96
98
if ($timeout_exception && $timeout_exception =~ / $exception_message / ){
97
99
my $response_with_timeout = Dancer::Response-> new(
98
100
status => 408,
99
- content => " Request Timeout : more than $timeout seconds elapsed."
101
+ content => " Request Timeout : more than $request_timeout seconds elapsed."
100
102
);
101
103
return $response_with_timeout ;
102
104
}
You can’t perform that action at this time.
0 commit comments