Browse Source

Revert "VLCHTTPUploaderController: change standard port to 8080 to avoid Chromecast conflicts"

This reverts commit a2c6cc00009152425af7e2ee3e8c5ebdcb98e85d.

(cherry picked from commit 510e9ac440825b5ea8019f415a0c9a6299e07afc)
Felix Paul Kühne 7 years ago
parent
commit
09e252f076
1 changed files with 12 additions and 6 deletions
  1. 12 6
      Sources/VLCHTTPUploaderController.m

+ 12 - 6
Sources/VLCHTTPUploaderController.m

@@ -102,11 +102,17 @@
 - (NSString *)httpStatus
 - (NSString *)httpStatus
 {
 {
     if (_httpServer.isRunning) {
     if (_httpServer.isRunning) {
-        return [NSString stringWithFormat:@"http://%@:%i\nhttp://%@:%i",
-                [self hostname],
-                _httpServer.listeningPort,
-                [self currentIPAddress],
-                _httpServer.listeningPort];
+        if (_httpServer.listeningPort != 80) {
+            return [NSString stringWithFormat:@"http://%@:%i\nhttp://%@:%i",
+                    [self currentIPAddress],
+                    _httpServer.listeningPort,
+                    [self hostname],
+                    _httpServer.listeningPort];
+        } else {
+            return [NSString stringWithFormat:@"http://%@\nhttp://%@",
+                    [self currentIPAddress],
+                    [self hostname]];
+        }
     } else {
     } else {
         return NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", nil);
         return NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", nil);
     }
     }
@@ -210,7 +216,7 @@
     APLog(@"Setting document root: %@", docRoot);
     APLog(@"Setting document root: %@", docRoot);
 
 
     [_httpServer setDocumentRoot:docRoot];
     [_httpServer setDocumentRoot:docRoot];
-    [_httpServer setPort:8080];
+    [_httpServer setPort:80];
 
 
     [_httpServer setConnectionClass:[VLCHTTPConnection class]];
     [_httpServer setConnectionClass:[VLCHTTPConnection class]];