Browse files

Remove pausing code from http proxy logic

This was causing corruption in proxied HTTP request bodies, maybe
because of the combination of "buffer" and pausing which both are
trying to do the same thing.
  • Loading branch information...
1 parent 1f0b3df commit 653acfa14914e3c08b1ab030f44b896bfa86d139 @jcheng5 jcheng5 committed Mar 11, 2013
Showing with 21 additions and 6 deletions.
  1. +20 −0 NEWS
  2. +0 −5 lib/proxy/http.js
  3. +1 −1 package.json
View
20 NEWS
@@ -0,0 +1,20 @@
+shiny-server 0.3.3
+--------------------------------------------------------------------------------
+
+* Remove pausing which is causing corruption in proxied HTTP request bodies.
+
+shiny-server 0.3.2
+--------------------------------------------------------------------------------
+
+* Make shiny-server compatible with httpuv package which we are introducing to
+ Shiny.
+
+shiny-server 0.3.1
+--------------------------------------------------------------------------------
+
+* Fix crashing bug when "req" object has no address.
+
+shiny-server 0.3.0
+--------------------------------------------------------------------------------
+
+* Initial release.
View
5 lib/proxy/http.js
@@ -13,7 +13,6 @@
var http = require('http');
var util = require('util');
var http_proxy = require('http-proxy');
-var pause = require('pause');
var Q = require('q');
var _ = require('underscore');
var AppSpec = require('../worker/app-spec');
@@ -86,7 +85,6 @@ function ShinyProxy(router, workerRegistry) {
// - Proxy the request.
this.httpListener = function(req, res) {
- var paused = pause(req);
var buffer = http_proxy.buffer(req);
// Figure out what application this URL belongs to, who it should run as,
@@ -152,9 +150,6 @@ function ShinyProxy(router, workerRegistry) {
err.consoleLogFile);
}
})
- .fin(function() {
- paused.resume();
- })
.done();
})
.done();
View
2 package.json
@@ -1,7 +1,7 @@
{
"name": "shiny-server",
"preferGlobal": "true",
- "version": "0.3.2",
+ "version": "0.3.3",
"author": "RStudio <node@rstudio.com>",
"description": "Application server for the Shiny web framework for R",
"bin": "./lib/main.js",

0 comments on commit 653acfa

Please sign in to comment.