/[smeserver]/rpms/e-smith-manager/sme9/e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch
ViewVC logotype

Diff of /rpms/e-smith-manager/sme9/e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by vip-ire, Sun Jan 31 21:54:06 2016 UTC Revision 1.3 by stephdl, Fri Mar 4 14:24:36 2016 UTC
# Line 6  diff -Nur e-smith-manager-2.4.0/root/etc Line 6  diff -Nur e-smith-manager-2.4.0/root/etc
6   $back ||= $ENV{HTTP_REFERER} if $ENV{HTTP_REFERER} && $BACK_REFERER;   $back ||= $ENV{HTTP_REFERER} if $ENV{HTTP_REFERER} && $BACK_REFERER;
7   $back = uri_unescape($back) if $back && $back =~ m/^https?%3A%2F%2F/i;   $back = uri_unescape($back) if $back && $back =~ m/^https?%3A%2F%2F/i;
8  -$back =~ s/^http:/https:/;  -$back =~ s/^http:/https:/;
9  +$back =~ s/^http:/https:/ if $server_name eq 'localhost';  +$back =~ s/^http:/https:/ if $server_name ne 'localhost';
10   #warn "back is $back\n";   #warn "back is $back\n";
11   if ($back && $back =~ m!^/!) {   if ($back && $back =~ m!^/!) {
12     my $hostname = $server_name;     my $hostname = $server_name;
# Line 18  diff -Nur e-smith-manager-2.4.0/root/etc Line 18  diff -Nur e-smith-manager-2.4.0/root/etc
18   $server_name ||= $ENV{SERVER_NAME};   $server_name ||= $ENV{SERVER_NAME};
19   $server_port ||= $ENV{SERVER_PORT};   $server_port ||= $ENV{SERVER_PORT};
20  -$server_port = '443';  -$server_port = '443';
21  +$server_port ( $server_name eq 'localhost' ) ? '80' : '443';  +$server_port = ( $server_name eq 'localhost' ) ? '80' : '443';
22   my $AUTH_DOMAIN = $server_name;   my $AUTH_DOMAIN = $server_name;
23   my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;   my $back = $q->cookie($at->back_cookie_name) if $at->back_cookie_name;
24   $back ||= $q->param($at->back_arg_name) if $at->back_arg_name;   $back ||= $q->param($at->back_arg_name) if $at->back_arg_name;

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed