--- old/modules/media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java	2015-10-01 16:34:37.447836100 -0700
+++ new/modules/media/src/main/java/com/sun/media/jfxmedia/locator/Locator.java	2015-10-01 16:34:36.948629700 -0700
@@ -229,12 +229,12 @@
         }
 
         // Verify the protocol is supported.
-        if (!isIpod && !protocol.equals("file") && !protocol.equals("http")) {
+        if (!isIpod && !MediaManager.canPlayProtocol(protocol)) {
             throw new UnsupportedOperationException("Unsupported protocol \"" + protocol + "\"");
         }
 
         // Check if we can block
-        if (protocol.equals("http")) {
+        if (protocol.equals("http") || protocol.equals("https")) {
             canBlock = true;
         }
 
@@ -343,7 +343,7 @@
                 if (protocol.equals("file")) {
                     // Map file:/somepath to file:///somepath
                     uriString = uriString.replaceFirst("/", "///");
-                } else if (protocol.equals("http")) {
+                } else if (protocol.equals("http") || protocol.equals("https")) {
                     // Map http:/somepath to http://somepath
                     uriString = uriString.replaceFirst("/", "//");
                 }
@@ -386,7 +386,7 @@
                 for (int numConnectionAttempts = 0; numConnectionAttempts < MAX_CONNECTION_ATTEMPTS; numConnectionAttempts++) {
                     try {
                         // Verify existence.
-                        if (scheme.equals("http")) {
+                        if (scheme.equals("http") || scheme.equals("https")) {
                             // Check ability to connect, trying HEAD before GET.
                             LocatorConnection locatorConnection = getConnection(uri, "HEAD");
                             if (locatorConnection == null || locatorConnection.connection == null) {