Added: allow [] in jsonp callback. Closes expressjs#1128

gradykarp · May 9, 2012 · df2584c · df2584c
1 parent 4de95c0
commit df2584c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/response.js b/lib/response.js
@@ -159,7 +159,7 @@ res.json = function(obj){
 
   if (callback && jsonp) {
     this.set('Content-Type', 'text/javascript');
-    body = callback.replace(/[^\w$.]/g, '') + '(' + body + ');';
+    body = callback.replace(/[^[]\w$.]/g, '') + '(' + body + ');';
   }
 
   return this.send(body);

diff --git a/test/res.json.js b/test/res.json.js
@@ -9,7 +9,6 @@ describe('res', function(){
       it('should respond with jsonp', function(done){
         var app = express();
 
-        // app.enable('jsonp callback');
         app.use(function(req, res){
           res.json({ count: 1 });
         });
@@ -22,6 +21,22 @@ describe('res', function(){
           done();
         })
       })
+
+      it('should allow []', function(done){
+        var app = express();
+
+        app.use(function(req, res){
+          res.json({ count: 1 });
+        });
+
+        request(app)
+        .get('/?callback=callbacks[123]')
+        .end(function(res){
+          res.headers.should.have.property('content-type', 'text/javascript; charset=utf-8');
+          res.body.should.equal('callbacks[123]({"count":1});');
+          done();
+        })
+      })
     })
 
     describe('when given primitives', function(){