Commit a2c6cc00 authored by Carola Nitz's avatar Carola Nitz

VLCHTTPUploaderController: change standard port to 8080 to avoid Chromecast conflicts

(cherry picked from commit a3b4797e)
parent 66620f2d
......@@ -107,17 +107,11 @@
- (NSString *)httpStatus
{
if (_httpServer.isRunning) {
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]];
}
return [NSString stringWithFormat:@"http://%@:%i\nhttp://%@:%i",
[self hostname],
_httpServer.listeningPort,
[self currentIPAddress],
_httpServer.listeningPort];
} else {
return NSLocalizedString(@"HTTP_UPLOAD_SERVER_OFF", nil);
}
......@@ -221,7 +215,7 @@
APLog(@"Setting document root: %@", docRoot);
[_httpServer setDocumentRoot:docRoot];
[_httpServer setPort:80];
[_httpServer setPort:8080];
[_httpServer setConnectionClass:[VLCHTTPConnection class]];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment