Browse Source

Fix mod_redirect: handles https:// urls as absolute rewrites, redirect if request is already handled is no error

personal/stbuehler/wip
Stefan Bühler 13 years ago
parent
commit
6e6921c552
  1. 8
      src/modules/mod_redirect.c

8
src/modules/mod_redirect.c

@ -342,6 +342,8 @@ static liHandlerResult redirect(liVRequest *vr, gpointer param, gpointer *contex
UNUSED(context);
if (li_vrequest_is_handled(vr)) return LI_HANDLER_GO_ON;
for (i = 0; i < rd->rules->len; i++) {
rule = &g_array_index(rd->rules, redirect_rule, i);
@ -409,6 +411,8 @@ static liAction* redirect_create(liServer *srv, liPlugin* p, liValue *val) {
/* redirect "/foo/bar"; */
if (g_str_has_prefix(val->data.string->str, "http://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (g_str_has_prefix(val->data.string->str, "https://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (val->data.string->str[0] == '/')
rule.type = REDIRECT_ABSOLUTE_PATH;
else if (val->data.string->str[0] == '?')
@ -430,6 +434,8 @@ static liAction* redirect_create(liServer *srv, liPlugin* p, liValue *val) {
/* only one rule */
if (g_str_has_prefix(g_array_index(arr, liValue*, 1)->data.string->str, "http://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (g_str_has_prefix(g_array_index(arr, liValue*, 1)->data.string->str, "https://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (g_array_index(arr, liValue*, 1)->data.string->str[0] == '/')
rule.type = REDIRECT_ABSOLUTE_PATH;
else if (g_array_index(arr, liValue*, 1)->data.string->str[0] == '?')
@ -471,6 +477,8 @@ static liAction* redirect_create(liServer *srv, liPlugin* p, liValue *val) {
if (g_str_has_prefix(g_array_index(v->data.list, liValue*, 1)->data.string->str, "http://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (g_str_has_prefix(g_array_index(v->data.list, liValue*, 1)->data.string->str, "https://"))
rule.type = REDIRECT_ABSOLUTE_URI;
else if (g_array_index(v->data.list, liValue*, 1)->data.string->str[0] == '/')
rule.type = REDIRECT_ABSOLUTE_PATH;
else if (g_array_index(v->data.list, liValue*, 1)->data.string->str[0] == '?')

Loading…
Cancel
Save