Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

More httpuv compatibility work

  • Loading branch information...
commit 33e626353cbd7aebb082b52995aa19ff790c96fc 1 parent 4803d6c
@jcheng5 jcheng5 authored
Showing with 4 additions and 4 deletions.
  1. +1 −2  R/SockJSAdapter.R
  2. +2 −1  lib/proxy/http.js
  3. +1 −1  package.json
View
3  R/SockJSAdapter.R
@@ -86,7 +86,6 @@ local({
ignore.case=T)
return(response)
}
-
options(shiny.http.response.filter=filter)
})
-runApp(Sys.getenv('SHINY_APP'),port=Sys.getenv('SHINY_PORT'),launch.browser=FALSE)
+runApp(Sys.getenv('SHINY_APP'),port=as.integer(Sys.getenv('SHINY_PORT')),launch.browser=FALSE)
View
3  lib/proxy/http.js
@@ -87,6 +87,7 @@ function ShinyProxy(router, workerRegistry) {
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,
// where the log file goes, etc.
@@ -140,7 +141,7 @@ function ShinyProxy(router, workerRegistry) {
});
logger.trace('Proxying request: ' + req.url);
- appWorkerHandle.proxy.proxyRequest(req, res);
+ appWorkerHandle.proxy.proxyRequest(req, res, buffer);
})
.fail(function(err) {
logger.info('Error getting worker: ' + err);
View
2  package.json
@@ -14,7 +14,7 @@
},
"dependencies" : {
"faye-websocket" : "0.4.3",
- "http-proxy" : "https://github.com/rstudio/node-http-proxy/tarball/4252933",
+ "http-proxy" : "https://github.com/rstudio/node-http-proxy/tarball/93605d3",
"sockjs" : "https://s3.amazonaws.com/rstudio-buildtools/sockjs-e3d3695.tar.gz",
"cjson" : "0.2.1",
"handlebars" : "1.0.7",
Please sign in to comment.
Something went wrong with that request. Please try again.