Merge lp:~trb143/openlp/removessl26 into lp:openlp
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2728 |
Merged at revision: | 2726 |
Proposed branch: | lp:~trb143/openlp/removessl26 |
Merge into: | lp:openlp |
Diff against target: |
293 lines (+22/-142) 4 files modified
openlp/plugins/remotes/lib/httpserver.py (+3/-24) openlp/plugins/remotes/lib/remotetab.py (+1/-83) tests/functional/openlp_plugins/remotes/test_remotetab.py (+18/-33) tests/functional/openlp_plugins/remotes/test_router.py (+0/-2) |
To merge this branch: | bzr merge lp:~trb143/openlp/removessl26 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Review via email: mp+318988@code.launchpad.net |
This proposal supersedes a proposal from 2017-03-04.
Commit message
With SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code and stop the settings and not start the SSL server, full removal will be in 2.8 when we change server infrastructure,
Description of the change
Will SSL being removed in 2.8 it and not supported in Android and iOS lets prevent it from living in 2.6.
Just removed the SSL code to stop the settings and not start the SSL server full removal will be in 2.8 when we change server infrastructure,
With test this time.
lp:~trb143/openlp/removessl26 (revision 2728)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
Could you add a new test please? It doesn't have to be related, can be anywhere else.