mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'feature/support-node-0.10' into develop

Browse source 
Conflicts:
	src/package.json
This commit is contained in:
Marcel Klehr 2013-04-01 13:29:07 +02:00
commit 04a53c4402
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/utils/caching_middleware.js
View file

@ -168,7 +168,7 @@ CachingMiddleware.prototype = new function () {
} else if (req.method == 'GET') {
var readStream = fs.createReadStream(pathStr);
res.writeHead(statusCode, headers);
util.pump(readStream, res);
readStream.pipe(res);
} else {
res.writeHead(statusCode, headers);
res.end();