From f6d10e84f297525c981907de3b5d2ed85429f62e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 12 Jan 2020 18:07:20 -0500
Subject: [PATCH] Fix basic auth.  TUrn ControlAddress into a URI if it isn't
 one

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
index 62ce79b82..ddb1dbe54 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/AxisV2.pm
@@ -51,8 +51,12 @@ sub open {
   my $self = shift;
 
   $self->loadMonitor();
+	if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
+		# Has no scheme at the beginning, so won't parse as a URI
+		$self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
+	}
   my $uri = URI->new($self->{Monitor}->{ControlAddress});
-  $ADDRESS = $uri->scheme.'://'.$uri->host().$uri->path().($uri->port()?':'.$uri->port():'');
+  $ADDRESS = $uri->scheme.'://'.$uri->authority().$uri->path().($uri->port()?':'.$uri->port():'');
 
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;