Skip to content

Fixes the escalate plugin such that redirects are followed #3087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zwoop merged 1 commit into from
Feb 7, 2018
Merged

Fixes the escalate plugin such that redirects are followed #3087

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions proxy/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7482,17 +7482,29 @@ TSCacheHttpInfoSizeSet(TSCacheHttpInfo infop, int64_t size)
// This API tells the core to follow normal (301/302) redirects using the
// standard Location: URL. This does not need to be called if you set an
// explicit URL using TSHttpTxnRedirectUrlSet().
//
// TODO: This should be deprecated on 7.1.x, and removed from 8.0.0, now that the configuration
// for this is properly overridable.
TSReturnCode
TSHttpTxnFollowRedirect(TSHttpTxn txnp, int on)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);

HttpSM *sm = (HttpSM *)txnp;

sm->enable_redirection = (on ? true : false);
// Make sure we allow for at least one redirection.
if (0 == sm->redirection_tries) {
sm->redirection_tries = 1;
// This is necessary since we might not have setup these overridable configurations
sm->t_state.setup_per_txn_configs();

if (on) {
sm->redirection_tries = 0;
sm->enable_redirection = true;
// Make sure we allow for at least one redirection.
if (sm->t_state.txn_conf->number_of_redirections <= 0) {
sm->t_state.txn_conf->number_of_redirections = 1;
}
} else {
sm->enable_redirection = false;
sm->t_state.txn_conf->number_of_redirections = 0;
}

return TS_SUCCESS;
Expand All @@ -7516,10 +7528,12 @@ TSHttpTxnRedirectUrlSet(TSHttpTxn txnp, const char *url, const int url_len)
sm->redirect_url = (char *)url;
sm->redirect_url_len = url_len;
sm->enable_redirection = true;
sm->redirection_tries = 0;

// Make sure we allow for at least one redirection.
if (0 == sm->redirection_tries) {
sm->redirection_tries = 1;
if (sm->t_state.txn_conf->number_of_redirections <= 0) {
sm->t_state.setup_per_txn_configs();
sm->t_state.txn_conf->number_of_redirections = 1;
}
}

Expand Down