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

Proposed by Billy Olsen on 2015-12-22
Status: Merged
Approved by: Mike Pontillo on 2015-12-22
Approved revision: 4058
Merged at revision: 4058
Proposed branch: lp:~billy-olsen/maas/lp1484696-proxypass-websockets-1.8
Merge into: lp:maas/1.8
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.8
Reviewer Review Type Date Requested Status
Mike Pontillo (community) 2015-12-22 Approve on 2015-12-22
Review via email: mp+281173@code.launchpad.net

Commit message

Specify the disablereuse=on for the websockets ProxyPass configuration to workaround upstream bug https://bz.apache.org/bugzilla/show_bug.cgi?id=55890

Description of the change

Specify the disablereuse=on for the websockets ProxyPass configuration to workaround upstream bug https://bz.apache.org/bugzilla/show_bug.cgi?id=55890

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.8.4.

Holding off on the 1.9 branch until 1.9.0 is out.

MAAS Lander (maas-lander) wrote :
Download full text (83.7 KiB)

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

Hit http://security.ubuntu.com trusty-security InRelease
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Translation-en
Hit http://prodstack-zon...

Mike Pontillo (mpontillo) wrote :

Re-trying. Random test failure; couldn't be related to this branch...

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 14:25:46 +0000
3+++ contrib/maas-http.conf 2015-12-22 06:12:06 +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

to all changes: