[hamradio-commits] [dump1090] 363/373: Some very basic improvements to the HTTP server code - add buffering and return 404 for file access problems.

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit 4f6248c0789492f425563ff218b2f68f567f46fd
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Sun Oct 19 14:14:38 2014 -0400

    Some very basic improvements to the HTTP server code - add buffering and return 404 for file access problems.
---
 debian/changelog               | 9 +++++++++
 debian/dump1090.links          | 4 ++--
 debian/patches/01-jquery.patch | 4 ++--
 debian/patches/series          | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29864dd..3055e44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dump1090 (1.09.1007.14+dfsg-2) unstable; urgency=low
+
+  * Add buffering to the HTTP server so we can serve jQuery and associated
+    files ourselves.
+  * Have the HTTP server return code 404 instead of 200 if it has problems
+    opening or reading files.
+
+ -- Matthew Ernisse <mernisse at ub3rgeek.net>  Sun, 19 Oct 2014 16:57:54 +0000
+
 dump1090 (1.09.1007.14+dfsg-1) unstable; urgency=low
 
   * Merge changes from upstream.
diff --git a/debian/dump1090.links b/debian/dump1090.links
index f0870f0..2d722fa 100644
--- a/debian/dump1090.links
+++ b/debian/dump1090.links
@@ -1,4 +1,4 @@
-usr/share/javascript/jquery/jquery.min.js usr/share/dump1090/public_html/jquery.js
-usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/dump1090/public_html/jquery-ui.js
+usr/share/javascript/jquery/jquery.js usr/share/dump1090/public_html/jquery.js
+usr/share/javascript/jquery-ui/jquery-ui.js usr/share/dump1090/public_html/jquery-ui.js
 usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/dump1090/public_html/jquery-ui.min.css
 usr/share/javascript/jquery-ui/css/smoothness/images usr/share/dump1090/public_html/images
diff --git a/debian/patches/01-jquery.patch b/debian/patches/01-jquery.patch
index ca6e018..4b56625 100644
--- a/debian/patches/01-jquery.patch
+++ b/debian/patches/01-jquery.patch
@@ -12,8 +12,8 @@ Forwarded: not-needed
 -		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
 -		<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 +		<link rel="stylesheet" href="jquery-ui.min.css" />
-+		<script src="jquery.min.js"></script>
-+		<script src="jquery-ui.min.js"></script>
++		<script src="jquery.js"></script>
++		<script src="jquery-ui.js"></script>
  		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
  		<script type="text/javascript" src="config.js"></script>
  		<script type="text/javascript" src="planeObject.js"></script>
diff --git a/debian/patches/series b/debian/patches/series
index 56fd378..cfa9b0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00-makefile.patch
 01-jquery.patch
+02-http-buffer.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git