Merge branch 'gzip' into devel

admin/generate-dev-bundle.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-BUNDLE_VERSION=0.1.0
+BUNDLE_VERSION=0.1.1
 UNAME=$(uname)
 ARCH=$(uname -m)
 
@@ -123,7 +123,7 @@ which npm
 
 cd "$DIR/lib/node_modules"
 npm install [email protected]
-npm install connect-gzip@0.1.5
+npm install gzippo@0.1.4
 npm install [email protected]
 npm install [email protected]
 npm install [email protected]
@@ -139,6 +139,9 @@ npm install [email protected]
 npm install [email protected]
 npm install [email protected]
 
+# unused, but kept in bundle for compatibility for a while.
+npm install [email protected]
+
 # Sockjs has a broken optional dependancy, and npm optional dependancies
 # don't seem to quite work. Fake it out with a checkout.
 git clone http://github.com/akdubya/rbytes.git

app/server/server.js

@@ -6,7 +6,7 @@ var fs = require("fs");
 var path = require("path");
 
 var connect = require('connect');
-var gzip = require('connect-gzip');
+var gzippo = require('gzippo');
 var argv = require('optimist').argv;
 var mime = require('mime');
 var handlebars = require('handlebars');
@@ -58,9 +58,8 @@ var run = function (bundle_dir) {
 
   // webserver
   var app = connect.createServer();
-  app.use(gzip.staticGzip(path.join(bundle_dir, 'static_cacheable'), {maxAge: 1000 * 60 * 60 * 24 * 365}));
-  app.use(gzip.staticGzip(path.join(bundle_dir, 'static')));
-  app.use(gzip.gzip());
+  app.use(gzippo.staticGzip(path.join(bundle_dir, 'static_cacheable'), {clientMaxAge: 1000 * 60 * 60 * 24 * 365}));
+  app.use(gzippo.staticGzip(path.join(bundle_dir, 'static')));
 
   var app_html = fs.readFileSync(path.join(bundle_dir, 'app.html'));
   var unsupported_html = fs.readFileSync(path.join(bundle_dir, 'unsupported.html'));

meteor

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.1.0
+BUNDLE_VERSION=0.1.1
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.