From f7236d7d58f944458de780712c00c6aae5522a53 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Wed, 16 Nov 2005 03:20:20 +0000
Subject: [PATCH] * 2005-11-15 0.6.1.5 released
---
.../net/i2p/i2ptunnel/I2PTunnelHTTPServer.java | 16 ++++++++++++++--
apps/syndie/java/src/net/i2p/syndie/Updater.java | 6 ++++--
.../src/net/i2p/syndie/web/ArchiveServlet.java | 14 ++++++++++++++
.../src/net/i2p/syndie/web/ExportServlet.java | 10 ++++++++++
.../java/src/net/i2p/syndie/web/PostServlet.java | 2 +-
core/java/src/net/i2p/CoreVersion.java | 4 ++--
history.txt | 4 +++-
initialNews.xml | 4 ++--
installer/install.xml | 2 +-
news.xml | 4 ++--
.../java/src/net/i2p/router/RouterVersion.java | 6 +++---
11 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
index 7ea0490bfc..8c1227eac1 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
@@ -224,8 +224,20 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
_gzipOut = new InternalGZIPOutputStream(out);
out = _gzipOut;
}
- public long getTotalRead() { return _gzipOut.getTotalRead(); }
- public long getTotalCompressed() { return _gzipOut.getTotalCompressed(); }
+ public long getTotalRead() {
+ InternalGZIPOutputStream gzipOut = _gzipOut;
+ if (gzipOut != null)
+ return gzipOut.getTotalRead();
+ else
+ return 0;
+ }
+ public long getTotalCompressed() {
+ InternalGZIPOutputStream gzipOut = _gzipOut;
+ if (gzipOut != null)
+ return gzipOut.getTotalCompressed();
+ else
+ return 0;
+ }
}
private class InternalGZIPOutputStream extends GZIPOutputStream {
public InternalGZIPOutputStream(OutputStream target) throws IOException {
diff --git a/apps/syndie/java/src/net/i2p/syndie/Updater.java b/apps/syndie/java/src/net/i2p/syndie/Updater.java
index 58ac8f48ab..ae618b6454 100644
--- a/apps/syndie/java/src/net/i2p/syndie/Updater.java
+++ b/apps/syndie/java/src/net/i2p/syndie/Updater.java
@@ -71,7 +71,9 @@ public class Updater {
try {
Thread.currentThread().sleep(5*60*1000);
} catch (InterruptedException ie) {}
-
+
+ // creates the default user if necessary
+ BlogManager.instance().getDefaultUser();
while (true) {
int delay = BlogManager.instance().getUpdateDelay();
update();
@@ -92,4 +94,4 @@ public class Updater {
_instance.notifyAll();
}
}
-}
\ No newline at end of file
+}
diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java
index 042cc433f0..7de9b3397f 100644
--- a/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java
+++ b/apps/syndie/java/src/net/i2p/syndie/web/ArchiveServlet.java
@@ -19,6 +19,20 @@ import net.i2p.syndie.data.*;
public class ArchiveServlet extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ handle(req, resp);
+ }
+
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ handle(req, resp);
+ }
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ handle(req, resp);
+ }
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ handle(req, resp);
+ }
+
+ public void handle(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
String path = req.getPathInfo();
if ( (path == null) || (path.trim().length() <= 1) ) {
renderRootIndex(resp);
diff --git a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java
index 6e7f844bb8..a586f5f7d2 100644
--- a/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java
+++ b/apps/syndie/java/src/net/i2p/syndie/web/ExportServlet.java
@@ -28,6 +28,16 @@ public class ExportServlet extends HttpServlet {
export(req, resp);
}
+ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ export(req, resp);
+ }
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ export(req, resp);
+ }
+ public void doPut(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ export(req, resp);
+ }
+
public static void export(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
try {
doExport(req, resp);
diff --git a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java
index 42acbfc367..f3a3e90525 100644
--- a/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java
+++ b/apps/syndie/java/src/net/i2p/syndie/web/PostServlet.java
@@ -152,7 +152,6 @@ public class PostServlet extends BaseServlet {
out.write("To make changes, hit your browser's back arrow and try again.\n");
out.write("Remote archive to push this post to: ");
out.write("<select class=\"b_postConfirm\" name=\"" + PARAM_REMOTE_ARCHIVE + "\">\n");
- out.write("<option name=\"\">None - don't push this post anywhere</option>\n");
PetNameDB db = user.getPetNameDB();
TreeSet names = new TreeSet();
for (Iterator iter = db.getNames().iterator(); iter.hasNext(); ) {
@@ -166,6 +165,7 @@ public class PostServlet extends BaseServlet {
out.write("<option value=\"" + HTMLRenderer.sanitizeTagParam(name) + "\">"
+ HTMLRenderer.sanitizeString(name) + "</option>\n");
}
+ out.write("<option name=\"\">None - don't push this post anywhere</option>\n");
out.write("</select><br />\n");
out.write("If you don't push this post remotely now, you can do so later on the <a href=\"syndicate.jsp\">syndicate</a> screen ");
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 1cb7d73968..8978cfe31f 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -14,8 +14,8 @@ package net.i2p;
*
*/
public class CoreVersion {
- public final static String ID = "$Revision: 1.46 $ $Date: 2005/10/14 08:48:04 $";
- public final static String VERSION = "0.6.1.4";
+ public final static String ID = "$Revision: 1.47 $ $Date: 2005/10/29 18:20:05 $";
+ public final static String VERSION = "0.6.1.5";
public static void main(String args[]) {
System.out.println("I2P Core version: " + VERSION);
diff --git a/history.txt b/history.txt
index 3e0c085c01..a509fc69bd 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,6 @@
-$Id: history.txt,v 1.320 2005/11/12 00:03:54 jrandom Exp $
+$Id: history.txt,v 1.321 2005/11/14 19:24:36 jrandom Exp $
+
+* 2005-11-15 0.6.1.5 released
2005-11-14 jrandom
* Migrate to the new Syndie interface
diff --git a/initialNews.xml b/initialNews.xml
index c49f183d79..dbec61a439 100644
--- a/initialNews.xml
+++ b/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/10/14 08:48:05 $">
- <i2p.release version="0.6.1.4" date="2005/10/29" minVersion="0.6"
+<i2p.news date="$Date: 2005/10/29 18:22:11 $">
+ <i2p.release version="0.6.1.5" date="2005/11/15" minVersion="0.6"
anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html"
diff --git a/installer/install.xml b/installer/install.xml
index abd9df60a5..66c45113e6 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
<info>
<appname>i2p</appname>
- <appversion>0.6.1.4</appversion>
+ <appversion>0.6.1.5</appversion>
<authors>
<author name="I2P" email="support@i2p.net"/>
</authors>
diff --git a/news.xml b/news.xml
index 33eb5c195e..341c6513b6 100644
--- a/news.xml
+++ b/news.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2005/10/14 08:48:05 $">
- <i2p.release version="0.6.1.4" date="2005/10/29" minVersion="0.6"
+<i2p.news date="$Date: 2005/10/29 18:22:11 $">
+ <i2p.release version="0.6.1.5" date="2005/11/15" minVersion="0.6"
anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html"
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index c4d40fd5ec..633464838b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
*
*/
public class RouterVersion {
- public final static String ID = "$Revision: 1.288 $ $Date: 2005/11/14 19:45:36 $";
- public final static String VERSION = "0.6.1.4";
- public final static long BUILD = 9;
+ public final static String ID = "$Revision: 1.289 $ $Date: 2005/11/15 01:38:00 $";
+ public final static String VERSION = "0.6.1.5";
+ public final static long BUILD = 0;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);
--
GitLab