oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed looping logic in HttpProxy redirect follower

Browse source
This commit is contained in:
Colin Kuskie 2006-11-17 23:42:19 +00:00
parent d0970a35bd
commit 5dddf92543
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,6 +1,7 @@
7.2.2
- fix: Show Debugging option not working
- fix: Workflow form control edit button won't work. removed.
- fix: Bug in HttpProxy.pm
7.2.1
- Made a change to version tag commits to deal with unusually long commit

9
lib/WebGUI/Asset/Wobject/HttpProxy.pm
View file

@ -265,7 +265,7 @@ sub view {
unless ($var{content}) {
# Get new content
for my $redirect (0..5) { # We follow max 5 redirects to prevent bouncing/flapping
REDIRECT: for my $redirect (0..4) { # We follow max 5 redirects to prevent bouncing/flapping
my $userAgent = new LWP::UserAgent;
$userAgent->agent($self->session->env->get("HTTP_USER_AGENT"));
@ -342,7 +342,6 @@ sub view {
if ($response->is_redirect) { # redirected by http header
$proxiedUrl = URI::URL::url($response->header("Location"))->abs($proxiedUrl);;
$redirect++;
} elsif ($response->content_type eq "text/html"
&& $response->content =~ /<meta[^>]+refresh[^>]+content[^>]*url=([^\s'"<>]+)/gis) {
# redirection through meta refresh
@ -353,11 +352,11 @@ sub view {
$proxiedUrl =~ s/[^\/\\]*$//; #chop off everything after / in $proxiedURl
$proxiedUrl .= URI::URL::url($refreshUrl)->rel($proxiedUrl); # add relative path
}
$redirect++;
} else {
$redirect = 5; #No redirection found. Leave loop.
last REDIRECT;
}
$redirect=5 if (not $self->get("followRedirect")); # No redirection. Overruled by setting
##At least 1 time through the loop
last REDIRECT if (not $self->get("followRedirect")); # No redirection. Overruled by setting
}
if($response->is_success) {