"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "server/plugins-available/nginx_plugin.inc.php" between
ISPConfig-3.2.4.tar.gz and ISPConfig-3.2.5.tar.gz

About: ISPConfig is an ISP management and Hosting Control Panel (for different Managed Services).

nginx_plugin.inc.php  (ISPConfig-3.2.4):nginx_plugin.inc.php  (ISPConfig-3.2.5)
skipping to change at line 1494 skipping to change at line 1494
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';'; $vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
$vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path']; $vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path'];
break; break;
} else { } else {
$rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/'; $rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/';
$exclude_own_hostname = $ tmp_redirect_path_parts['host']; $exclude_own_hostname = $ tmp_redirect_path_parts['host'];
} }
} else { } else {
// external URL // external URL
$rewrite_exclude = '(?!\.well-kno wn/acme-challenge)/'; $rewrite_exclude = '(?!/(\.well-k nown/acme-challenge))/';
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['use_proxy'] = 'y'; $vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_re direct_path_parts['path']; $rewrite_subdir = $tmp_re direct_path_parts['path'];
if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1); if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1);
if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/'; if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/';
if($rewrite_subdir == '/' ) $rewrite_subdir = ''; if($rewrite_subdir == '/' ) $rewrite_subdir = '';
} }
} }
unset($tmp_redirect_path); unset($tmp_redirect_path);
unset($tmp_redirect_path_parts); unset($tmp_redirect_path_parts);
skipping to change at line 1546 skipping to change at line 1546
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';'; $vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
$vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path']; $vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path'];
break; break;
} else { } else {
$rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/'; $rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/';
$exclude_own_hostname = $ tmp_redirect_path_parts['host']; $exclude_own_hostname = $ tmp_redirect_path_parts['host'];
} }
} else { } else {
// external URL // external URL
$rewrite_exclude = '(?!\.well-kno wn/acme-challenge)/'; $rewrite_exclude = '(?!/(\.well-k nown/acme-challenge))/';
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['use_proxy'] = 'y'; $vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_re direct_path_parts['path']; $rewrite_subdir = $tmp_re direct_path_parts['path'];
if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1); if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1);
if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/'; if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/';
if($rewrite_subdir == '/' ) $rewrite_subdir = ''; if($rewrite_subdir == '/' ) $rewrite_subdir = '';
} }
} }
unset($tmp_redirect_path); unset($tmp_redirect_path);
unset($tmp_redirect_path_parts); unset($tmp_redirect_path_parts);
skipping to change at line 1596 skipping to change at line 1596
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';'; $vhost_data['web_document _root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
$vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path']; $vhost_data['web_document _root_www'] .= $tmp_redirect_path_parts['path'];
break; break;
} else { } else {
$rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/'; $rewrite_exclude = '(?!/( '.substr($tmp_redirect_path_parts['path'], 1).(substr($tmp_redirect_path_parts[' path'], 1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : ' ').'|\.well-known/acme-challenge))/';
$exclude_own_hostname = $ tmp_redirect_path_parts['host']; $exclude_own_hostname = $ tmp_redirect_path_parts['host'];
} }
} else { } else {
// external URL // external URL
$rewrite_exclude = '(?!\.well-kno wn/acme-challenge)/'; $rewrite_exclude = '(?!/(\.well-k nown/acme-challenge))/';
if($data['new']['redirect_type'] == 'proxy'){ if($data['new']['redirect_type'] == 'proxy'){
$vhost_data['use_proxy'] = 'y'; $vhost_data['use_proxy'] = 'y';
$rewrite_subdir = $tmp_re direct_path_parts['path']; $rewrite_subdir = $tmp_re direct_path_parts['path'];
if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1); if(substr($rewrite_subdir , 0, 1) == '/') $rewrite_subdir = substr($rewrite_subdir, 1);
if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/'; if(substr($rewrite_subdir , -1) != '/') $rewrite_subdir .= '/';
if($rewrite_subdir == '/' ) $rewrite_subdir = ''; if($rewrite_subdir == '/' ) $rewrite_subdir = '';
} }
} }
unset($tmp_redirect_path); unset($tmp_redirect_path);
unset($tmp_redirect_path_parts); unset($tmp_redirect_path_parts);
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)