implemented fix

mschwartz · Oct 8, 2014 · bf94445 · bf94445
1 parent 21283dc
commit bf94445
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/httpd/config.js b/httpd/config.js
@@ -39,6 +39,7 @@
         watchdogTimeout: 30,    // if process runs this long for a request, the alarm handler will exit()
         listenIp: '0.0.0.0',    // listen socket will be bound to this IP.  '0.0.0.0' means ANY IP on this machine.
         documentRoot: docRoot,
+		sendFile: true, // Enable/Disable linux sendFile()
         logFile: '/tmp/httpd-silkjs.log',
         directoryIndex: [
             'index.sjs',

diff --git a/httpd/response.js b/httpd/response.js
@@ -207,7 +207,14 @@ res = function() {
 				}
 				res.contentLength = size;
 				res.sendHeaders();
-				net.sendFile(res.sock, fn, 0, size); // (FileSystem.readfile64(fn));
+				if (Config.sendFile || Config.sendFile == undefined) {
+					net.sendFile(res.sock, fn, 0, size); // (FileSystem.readfile64(fn));
+				} else {
+				    var file = fs.open(fn, fs.O_RDONLY);
+					var content = net.read(file, size, size);
+                    net.write(res.sock, content, size);
+                    fs.close(file);
+				}
 			}
 			catch (e) {
 				throw e;