From 790cb86a8f98ddcd5cc7cb109f2b6a990cd4814e Mon Sep 17 00:00:00 2001 From: ftimme Date: Mon, 9 Apr 2012 22:54:00 +0000 Subject: [PATCH] - Make sure no rewrite rules are created if the redirect path is empty. --- server/plugins-available/apache2_plugin.inc.php | 4 ++-- server/plugins-available/nginx_plugin.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 1f4cc2bc4..650b8432b 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -755,7 +755,7 @@ class apache2_plugin { // Rewrite rules $rewrite_rules = array(); - if($data['new']['redirect_type'] != '') { + if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') { if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/'; if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){ $rewrite_target = 'http'.substr($data['new']['redirect_path'],8); @@ -821,7 +821,7 @@ class apache2_plugin { } $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG); // Rewriting - if($alias['redirect_type'] != '') { + if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') { if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/'; if(substr($alias['redirect_path'],0,8) == '[scheme]'){ $rewrite_target = 'http'.substr($alias['redirect_path'],8); diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 40ff35883..d345ec524 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -778,7 +778,7 @@ class nginx_plugin { // Rewrite rules $rewrite_rules = array(); - if($data['new']['redirect_type'] != '') { + if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') { if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/'; if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8); /* Disabled path extension @@ -834,7 +834,7 @@ class nginx_plugin { } $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG); // Rewriting - if($alias['redirect_type'] != '') { + if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') { if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/'; if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8); -- GitLab