From 6ebedff2e1f6b7da52f4539cf4fed9989bbfbeb1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 4 Apr 2018 16:45:25 -0400
Subject: [PATCH] If using MIN_STREAMING_PORT then use ['SERVER_NAME'] instead
 of HTTP_HOST because HTTP_HOST may contain a custom port

---
 web/includes/Monitor.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index b5d95f83f..fd464d72d 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -199,11 +199,11 @@ private $control_fields = array(
     if ( isset($this->{'ServerId'}) and $this->{'ServerId'} ) {
       $Server = new Server( $this->{'ServerId'} );
       $streamSrc .= $Server->Hostname();
+    } else if ( ZM_MIN_STREAMING_PORT )
+      $streamSrc .= $_SERVER['SERVER_NAME'].':'.(ZM_MIN_STREAMING_PORT+$this->{'Id'});
     } else {
       $streamSrc .= $_SERVER['HTTP_HOST'];
     }
-    if ( ZM_MIN_STREAMING_PORT )
-      $streamSrc .= ':'. (ZM_MIN_STREAMING_PORT+$this->{'Id'});
     $streamSrc .= ZM_PATH_ZMS;
 
     $args['monitor'] = $this->{'Id'};