Ticket #3990: apache_mod_proxy.3.patch

mythweb/includes/utils.php

@@ -330 +330 @@
         if (!$ext && $_SESSION['file_url_override'])
             return 'file://'.$_SESSION['file_url_override'].str_replace('%2F', '/', rawurlencode(basename($show->filename)));
     // Which protocol should we use for downloads?
+
         $url = (($_SESSION['stream']['force_http'] || !isset($_SERVER['HTTPS']))
-                 ? 'http://' .$_SERVER['HTTP_HOST'].':'._or($_SESSION['stream']['force_http_port'], '80')
-                 : 'https://'.$_SERVER['HTTP_HOST'].':'._or($_SESSION['stream']['force_http_port'], '443')
+                 ? 'http://' . http_host .':'._or($_SESSION['stream']['force_http_port'], '80')
+                 : 'https://'. http_host .':'._or($_SESSION['stream']['force_http_port'], '443')
                )
                .root."pl/stream/$show->chanid/$show->recstartts";
     // Handle specific file extension modes
@@ -350 +351 @@
     // Windows likely gets a myth:// url -- grab the master host and port
         global $Master_Host, $Master_Port;
     // Is either the browser xor the master in an rfc 1918 zone?
+        $remoteaddr = $_SERVER['REMOTE_ADDR'];
+        if (isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+            $remoteaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
         if (preg_match('/^(?:10|192\.168|172\.(?:1[6-9]|2[0-9]|3[0-6]))\./', $Master_Host)
-                xor preg_match('/^(?:10|192\.168|172\.(?:1[6-9]|2[0-9]|3[0-6]))\./', $_SERVER['REMOTE_ADDR'])) {
+                xor preg_match('/^(?:10|192\.168|172\.(?:1[6-9]|2[0-9]|3[0-6]))\./', $remoteaddr)) {
             return $url;
         }
     // Send the myth url

mythweb/includes/defines.php

@@ -64 +64 @@
     define('mb', 1024 * kb);    // Megabyte
     define('gb', 1024 * mb);    // Gigabyte
     define('tb', 1024 * gb);    // Terabyte
+
+// Define the http host used for access
+
+    define('http_host', isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : $_SERVER['HTTP_HOST']);
+

mythweb/modules/music/handler.php

@@ -45 +45 @@
         $protocol = "http://";
         if (!$_SESSION['stream']['force_http'] && isset($_SERVER['HTTPS']))
             $protocol = "https://";
-        return $protocol.$_SERVER["HTTP_HOST"].root.'music/';
+        return $protocol. http_host .root.'music/';
     }
 

mythweb/modules/stream/handler.pl

@@ -91 +91 @@
         my $uri = ($ENV{'HTTPS'} || $ENV{'SERVER_PORT'} == 443)
                    ? 'https'
                    : 'http';
-        $uri .= '://'.($ENV{'SERVER_NAME'} or $ENV{'SERVER_ADDR'}).':'.$ENV{'SERVER_PORT'}
+        my $serverAddr = $ENV{'HTTP_X_FORWARDED_HOST'} || $ENV{'SERVER_NAME'} || $ENV{'SERVER_ADDR'};
+        $uri .= '://'.$serverAddr.':'.$ENV{'SERVER_PORT'}
                .$ENV{'REQUEST_URI'};
+
         $uri =~ s/\.asx$//i;
     # Build the ASX file so we can know how long it is
         my $file = <<EOF;