From 93f040aea88eda006f328dba0b0780ad481b9413 Mon Sep 17 00:00:00 2001
From: Damian Bushong <stratosphere.programming@gmail.com>
Date: Fri, 5 Jul 2013 11:44:50 -0500
Subject: [PATCH 1/2] Update webserver.js
Tighten code around sending xml data
---
src/webserver.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/webserver.js b/src/webserver.js
index 860130baca..9d2ef218e6 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -149,13 +149,11 @@ var express = require('express'),
if (cid.match('.rss')) {
fs.readFile('feeds/categories/' + cid, function (err, data) {
if (err) {
- res.send("Unable to locate an rss feed at this location.");
+ res.send(404, "Unable to locate an rss feed at this location.");
return;
}
- res.setHeader('Content-Type', 'application/xml');
- res.setHeader('Content-Length', data.length);
- res.end(data);
+ res.type('xml').set('Content-Length', data.length).send(data);
});
return;
}
@@ -352,4 +350,4 @@ var express = require('express'),
}(WebServer));
server.listen(config.port);
-global.server = server;
\ No newline at end of file
+global.server = server;
From cec23817e21b9f48f78ae644d3c385ebda404b54 Mon Sep 17 00:00:00 2001
From: Damian Bushong <stratosphere.programming@gmail.com>
Date: Fri, 5 Jul 2013 11:50:58 -0500
Subject: [PATCH 2/2] Update webserver.js
Forgot this section - also use text/plain mimetype since we're not responding using XML to errors; if we're going to do that, we need to do it right in the first place.
---
src/webserver.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/webserver.js b/src/webserver.js
index 9d2ef218e6..f8cd284558 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -121,13 +121,11 @@ var express = require('express'),
if (tid.match('.rss')) {
fs.readFile('feeds/topics/' + tid, function (err, data) {
if (err) {
- res.send("Unable to locate an rss feed at this location.");
+ res.type('text').send(404, "Unable to locate an rss feed at this location.");
return;
}
- res.setHeader('Content-Type', 'application/xml');
- res.setHeader('Content-Length', data.length);
- res.end(data);
+ res.type('xml').set('Content-Length', data.length).send(data);
});
return;
}
@@ -149,7 +147,7 @@ var express = require('express'),
if (cid.match('.rss')) {
fs.readFile('feeds/categories/' + cid, function (err, data) {
if (err) {
- res.send(404, "Unable to locate an rss feed at this location.");
+ res.type('text').send(404, "Unable to locate an rss feed at this location.");
return;
}