fix: fixes redirects #7136
Merged
fix: fixes redirects #7136
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alexgarel
approved these changes
Jul 26, 2022
| @@ -435,6 +435,33 @@ sub process_template($template_filename, $template_data_ref, $result_content_ref | |||
| } | |||
|
|
|||
|
|
|||
| =head2 redirect($status_code, $redirect_url) | |||
There was a problem hiding this comment.
to @yuktea : typically a function that, when we will split is part of "http utils" more than display.
| @@ -435,6 +435,33 @@ sub process_template($template_filename, $template_data_ref, $result_content_ref | |||
| } | |||
|
|
|||
|
|
|||
| =head2 redirect($status_code, $redirect_url) | |||
There was a problem hiding this comment.
didn't you forget to add it to export ?
There was a problem hiding this comment.
right, I'll add it. I just noticed I was also exporting init which has been renamed to init_request
|
|
||
| $r->headers_out->set(Location => $redirect_url); | ||
| $r->status($status_code); | ||
| # note: under mod_perl, exit() will end the request without terminating the Apache mod_perl process |
| @@ -472,7 +499,7 @@ sub init_request() { | |||
| $bodyabout = ''; | |||
| $admin = 0; | |||
|
|
|||
| my $r = shift; | |||
| my $r = Apache2::RequestUtil->request(); | |||
There was a problem hiding this comment.
you can remove the code below:
if (not defined $r) {
$r = Apache2::RequestUtil->request();
}
|
Kudos, SonarCloud Quality Gate passed!
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The recent refactor of init() -> init_request() broke the way we did redirects (e.g. when someone make a request for https://fr-fr.openfoodfacts.org/categorie/cafe , we redirect to https://fr.openfoodfacts.org/categorie/cafes )
In fact previously it only worked for requests proceessed by display.pl (so everything except URLs starting by /cgi/)
This fixes it and ensure the request is terminated as soon as we have determined that we should redirect to a different url.