Merge lp:~dbarth/media-hub/fix-allowed-uri-scheme into lp:media-hub/stable

[David Barth]

Allow media-hub to process streams coming via HTTPS urls

Allow media-hub to process streams coming via HTTPS urls

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/media-hub-ci/375/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/215
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/215

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/375/rebuild

review: Approve (continuous-integration)

[lp:~dbarth/media-hub/fix-allowed-uri-scheme]

150. By David Barth on 2015-08-18

add changelog

151. By David Barth on 2015-08-18

changelog

152. By David Barth on 2015-08-18

manual change of the changelog to allow CI build to proceed

153. By David Barth on 2015-08-19

add a changelog entry for CI

[Jim Hodapp (jhodapp)]

Looks good

review: Approve (code)

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-10 18:12:22 +0000
+++ debian/changelog	2015-08-19 07:38:21 +0000
@@ -1,4 +1,10 @@
-media-hub (3.1.0+15.10.20150710-0ubuntu1) wily; urgency=medium
+media-hub (3.1.0+15.04.20150818-0ubuntu1) vivid; urgency=medium
+
+  * Add HTTPS to the list of supported URL schemes (courtesy Justin McPherson)
+
+ -- David Barth <[e-mail]>  Wed, 19 Aug 2015 09:22:37 +0200
+
+media-hub (3.1.0+15.04.20150710-0ubuntu1) vivid; urgency=medium
 
   [ CI Train Bot ]
   * New rebuild forced.

=== modified file 'src/core/media/apparmor/ubuntu.cpp'
--- src/core/media/apparmor/ubuntu.cpp	2014-11-26 16:23:19 +0000
+++ src/core/media/apparmor/ubuntu.cpp	2015-08-19 07:38:21 +0000
@@ -177,7 +177,9 @@
     {
         return Result{true, "Client can access content in /usr/share/sounds"};
     }
-    else if (parsed_uri.scheme == "http" || parsed_uri.scheme == "rtsp")
+    else if (parsed_uri.scheme == "http" ||
+             parsed_uri.scheme == "https" ||
+             parsed_uri.scheme == "rtsp")
     {
         return Result{true, "Client can access streaming content"};
     }