* Make sure we're running in nginx 1.1.4 or later.

audreyt · May 29, 2012 · 71eb154 · 71eb154
1 parent 6c5b6b1
commit 71eb154
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/dotcloud.coffee b/dotcloud.coffee
@@ -1,5 +1,9 @@
 @include = -> try
-  @io.configure => @io.set "transports", ["websocket", "flashsocket", "xhr-polling", "jsonp-polling"]
+  @io.configure => @io.set "transports", if @KEY then [
+    "jsonp-polling"
+  ] else [
+    "websocket", "flashsocket", "xhr-polling", "jsonp-polling"
+  ]
 
   json = require('fs').readFileSync('/home/dotcloud/environment.json', 'utf8')
   env = process.env

diff --git a/nginx/conf/nginx.conf b/nginx/conf/nginx.conf
@@ -8,6 +8,7 @@ http {
 
         location / {
             proxy_pass http://127.0.0.1:8000;
+            proxy_http_version 1.1;
         }
 
         location ~ /\. {
@@ -16,6 +17,7 @@ http {
 
         location ~ /edit$ {
             proxy_pass http://127.0.0.1:8000;
+            proxy_http_version 1.1;
             auth_basic "Editor Only";
             auth_basic_user_file .htpasswd;
         }