Merge branch 'master' into CDB-3686

NEWS.md

@@ -1,6 +1,12 @@
-1.13.1 -- 2014-mm-dd
+1.13.2 -- 2014-mm-dd
 --------------------
 
+1.13.1 -- 2014-08-04
+--------------------
+
+Enhancements:
+ - Profiler header sent as JSON string
+
 
 1.13.0 -- 2014-07-30
 --------------------

lib/cartodb/cartodb_windshaft.js

@@ -240,8 +240,7 @@ var CartodbWindshaft = function(serverOptions) {
         },
         function finish(err, response){
             if ( req.profiler ) {
-              var report = req.profiler.toString();
-              res.header('X-Tiler-Profiler', report);
+              res.header('X-Tiler-Profiler', req.profiler.toJSONString());
             }
             if (err){
                 response = { error: ''+err };
@@ -297,8 +296,7 @@ var CartodbWindshaft = function(serverOptions) {
         },
         function finish(err, response){
             if ( req.profiler ) {
-              var report = req.profiler.toString();
-              res.header('X-Tiler-Profiler', report);
+              res.header('X-Tiler-Profiler', req.profiler.toJSONString());
             }
             if (err){
                 var statusCode = 400;
@@ -609,8 +607,7 @@ var CartodbWindshaft = function(serverOptions) {
 
     function finish_instanciation(err, response, res, req) {
         if ( req.profiler ) {
-          var report = req.profiler.toString();
-          res.header('X-Tiler-Profiler', report);
+          res.header('X-Tiler-Profiler', req.profiler.toJSONString());
         }
         if (err) {
             var statusCode = 400;

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "dependencies": {
     "node-varnish": {
       "version": "0.3.0",

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.13.1",
+    "version": "1.13.2",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"