From db0b10665627b5911eade20c0533640f3aeddaa6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 2 May 2014 17:03:06 -0400 Subject: [PATCH] nanohttpd submodule for supporting local HTTP repos This webserver is the core of the kerplapp swap local repo when used over IP connections (WiFi). It is the smallest Java webserver we could find. It is included as a git submodule, but then only the actual source files that are needed are included. They are symlinked in src/. The git repo used is the one that we submitted upstream as a pull request. The pull request contains changes required to support https://. It has not yet been accepted, so we cannot yet use the official repo. Once the pull request is included, this should be switched to the latest release in the official git repo. https://github.com/eighthave/nanohttpd https://github.com/NanoHttpd/nanohttpd/pull/107 refs #3204 https://dev.guardianproject.info/issues/3204 --- .gitmodules | 3 +++ extern/nanohttpd | 1 + src/fi/iki/elonen/InternalRewrite.java | 1 + src/fi/iki/elonen/NanoHTTPD.java | 1 + src/fi/iki/elonen/ServerRunner.java | 1 + src/fi/iki/elonen/WebServerPlugin.java | 1 + src/fi/iki/elonen/WebServerPluginInfo.java | 1 + 7 files changed, 9 insertions(+) create mode 160000 extern/nanohttpd create mode 120000 src/fi/iki/elonen/InternalRewrite.java create mode 120000 src/fi/iki/elonen/NanoHTTPD.java create mode 120000 src/fi/iki/elonen/ServerRunner.java create mode 120000 src/fi/iki/elonen/WebServerPlugin.java create mode 120000 src/fi/iki/elonen/WebServerPluginInfo.java diff --git a/.gitmodules b/.gitmodules index 7d39cfc6f..f4e70c3aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ path = extern/AndroidPinning url = http://gitlab.doeg.gy/cpu/androidpinning.git ignore = dirty +[submodule "extern/nanohttpd"] + path = extern/nanohttpd + url = https://github.com/eighthave/nanohttpd diff --git a/extern/nanohttpd b/extern/nanohttpd new file mode 160000 index 000000000..58f73260e --- /dev/null +++ b/extern/nanohttpd @@ -0,0 +1 @@ +Subproject commit 58f73260ed98df878bae1051dc8e6a0bce842fcb diff --git a/src/fi/iki/elonen/InternalRewrite.java b/src/fi/iki/elonen/InternalRewrite.java new file mode 120000 index 000000000..1032b32ff --- /dev/null +++ b/src/fi/iki/elonen/InternalRewrite.java @@ -0,0 +1 @@ +../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/InternalRewrite.java \ No newline at end of file diff --git a/src/fi/iki/elonen/NanoHTTPD.java b/src/fi/iki/elonen/NanoHTTPD.java new file mode 120000 index 000000000..e901c0713 --- /dev/null +++ b/src/fi/iki/elonen/NanoHTTPD.java @@ -0,0 +1 @@ +../../../../extern/nanohttpd/core/src/main/java/fi/iki/elonen/NanoHTTPD.java \ No newline at end of file diff --git a/src/fi/iki/elonen/ServerRunner.java b/src/fi/iki/elonen/ServerRunner.java new file mode 120000 index 000000000..5e86528e1 --- /dev/null +++ b/src/fi/iki/elonen/ServerRunner.java @@ -0,0 +1 @@ +../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/ServerRunner.java \ No newline at end of file diff --git a/src/fi/iki/elonen/WebServerPlugin.java b/src/fi/iki/elonen/WebServerPlugin.java new file mode 120000 index 000000000..e47bc1985 --- /dev/null +++ b/src/fi/iki/elonen/WebServerPlugin.java @@ -0,0 +1 @@ +../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPlugin.java \ No newline at end of file diff --git a/src/fi/iki/elonen/WebServerPluginInfo.java b/src/fi/iki/elonen/WebServerPluginInfo.java new file mode 120000 index 000000000..b50012005 --- /dev/null +++ b/src/fi/iki/elonen/WebServerPluginInfo.java @@ -0,0 +1 @@ +../../../../extern/nanohttpd/webserver/src/main/java/fi/iki/elonen/WebServerPluginInfo.java \ No newline at end of file