Merge lp:~billy-olsen/maas/lp1484696-proxypass-websockets-1.9 into lp:maas/1.9

Proposed by Billy Olsen on 2015-12-22
Status: Merged
Approved by: Blake Rouse on 2016-01-07
Approved revision: 4534
Merged at revision: 4535
Proposed branch: lp:~billy-olsen/maas/lp1484696-proxypass-websockets-1.9
Merge into: lp:maas/1.9
Diff against target: 12 lines (+1/-1)
1 file modified
contrib/maas-http.conf (+1/-1)
To merge this branch: bzr merge lp:~billy-olsen/maas/lp1484696-proxypass-websockets-1.9
Reviewer Review Type Date Requested Status
Mike Pontillo (community) 2015-12-22 Approve on 2015-12-22
Review via email: mp+281178@code.launchpad.net

Commit message

Fix bug in apache2 where it will reuse websocket connections.

To post a comment you must log in.
Mike Pontillo (mpontillo) wrote :

Looks good. Thanks for the fixes! I'll discuss when to land this fix at the next team meeting.

review: Approve
Mike Pontillo (mpontillo) wrote :

Landing this for 1.9.1.

MAAS Lander (maas-lander) wrote :
Download full text (1.3 MiB)

The attempt to merge lp:~billy-olsen/maas/lp1484696-proxypass-websockets-1.9 into lp:maas/1.9 failed. Below is the output from the failed tests.

Ign http://prodstack-zone-2.clouds.archive.ubuntu.com trusty InRelease
Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty Release
Get:3 http://security.ubuntu.com trusty-security/main Sources [102 kB]
Get:4 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/main Sources [248 kB]
Get:5 http://security.ubuntu.com trusty-security/universe Sources [32.3 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,359 B]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [402 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/universe Sources [146 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,161 B]
Get:10 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [683 kB]
Get:11 http://security.ubuntu.com trusty-security/universe amd64 Packages [122 kB]
Get:12 http://security.ubuntu.com trusty-security/main Translation-en [220 kB]
Get:13 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:14 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [333 kB]
Get:15 http://security.ubuntu.com trusty-security/universe Translation-en [71.6 kB]
Get:16 http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.0 kB]
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-2.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/maas-http.conf'
2--- contrib/maas-http.conf 2015-06-26 13:07:33 +0000
3+++ contrib/maas-http.conf 2015-12-22 06:53:45 +0000
4@@ -26,7 +26,7 @@
5
6 <IfModule proxy_module>
7 ProxyPreserveHost on
8- ProxyPass /MAAS/ws "ws://localhost:5240/MAAS/ws"
9+ ProxyPass /MAAS/ws "ws://localhost:5240/MAAS/ws" disablereuse=on
10 ProxyPass /MAAS/static/ !
11 ProxyPass /MAAS/ http://localhost:5240/MAAS/
12 ProxyPass /MAAS http://localhost:5240/MAAS/

Subscribers

People subscribed via source and target branches