merge of '878149500938c6886eb9e0274ba0901e8fe3a3bb'

and 'deab42b1e2bfe970ba51a868ab2b8c47181fdd15'

apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java

@@ -7,6 +7,8 @@ package org.klomp.snark;
  * It is also passed from PeerState to PeerCoordinator when
  * a piece is not completely downloaded, for example
  * when the Peer disconnects or chokes.
+ *
+ * @since 0.8.2
  */
 class PartialPiece implements Comparable {
 

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

@@ -31,7 +31,9 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
     public I2PTunnelClient(int localPort, String destinations, Logging l, 
                            boolean ownDest, EventDispatcher notifyThis, 
                            I2PTunnel tunnel, String pkf) throws IllegalArgumentException {
-        super(localPort, ownDest, l, notifyThis, "SynSender", tunnel, pkf);
+        super(localPort, ownDest, l, notifyThis,
+              "Standard client on " + tunnel.listenHost + ':' + localPort,
+              tunnel, pkf);
 
         if (waitEventValue("openBaseClientResult").equals("error")) {
             notifyEvent("openClientResult", "error");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

@@ -73,7 +73,7 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
         _proxyList = new ArrayList(4);
     }
 
-    /** all auth @ince 0.8.2 */
+    /** all auth @since 0.8.2 */
     public static final String PROP_AUTH = "proxyAuth";
     public static final String PROP_USER = "proxyUsername";
     public static final String PROP_PW = "proxyPassword";

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -355,6 +355,7 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("Read the http command [" + command.toString() + "]");
         
+        // FIXME we probably don't need or want this in the outgoing direction
         int trimmed = 0;
         if (command.length() > 0) {
             for (int i = 0; i < command.length(); i++) {
@@ -394,7 +395,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 else if ("X-Accept-encoding".equalsIgnoreCase(name))
                     name = "X-Accept-encoding";
 
-                //We want to remove certain headers to improve anonymity
+                // For incoming, we remove certain headers to prevent spoofing.
+                // For outgoing, we remove certain headers to improve anonymity.
                 boolean skip = false;
                 for (String skipHeader: skipHeaders) {
                     if (skipHeader.equalsIgnoreCase(name)) {

build.xml

@@ -529,7 +529,7 @@
 
     <!-- readme and proxy error page files, initialNews.xml files, GeoIP files, and flag icons -->
     <target name="prepConsoleDocs" depends="prepConsoleDocUpdates, prepgeoupdate" >
-        <copy todir="pkg-temp/docs/" >
+        <copy todir="pkg-temp/docs/initialNews/">
           <fileset dir="installer/resources/initialNews/" />
         </copy>
     </target>

core/java/src/net/i2p/CoreVersion.java

@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.8.1";
+    public final static String VERSION = "0.8.2";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);

core/java/src/net/i2p/data/SimpleDataStructure.java

@@ -28,7 +28,7 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
     /** this is just to avoid lots of calls to length() */
     protected final int _length;
     
-    /** A new instance with the data set to null. Call readBytes(), setData(), or from ByteArray() after this to set the data */
+    /** A new instance with the data set to null. Call readBytes(), setData(), or fromByteArray() after this to set the data */
     public SimpleDataStructure() {
         _length = length();
     }

history.txt

@@ -1,7 +1,4 @@
-2010-12-19 sponge
+* 2010-12-22  0.8.2 released
-    * Fix missing </A> in Resource.java
-    * Fix URI.java parse issue
-    * Fix FileResource.java logic bug
 
 2010-12-13 dr|z3d
     * Console themes: Midnight & Classic renovations.

installer/install.xml

@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.8.1</appversion>
+        <appversion>0.8.2</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>

installer/resources/news.xml

@@ -1,25 +1,24 @@
 <!--
-<i2p.news date="$Date: 2010-11-15 00:00:00 $">
+<i2p.news date="$Date: 2010-12-22 00:00:00 $">
-<i2p.release version="0.8.1" date="2010/11/15" minVersion="0.6" />
+<i2p.release version="0.8.2" date="2010/12/22" minVersion="0.6" />
 -->
 <div lang="en">
-<h3>2010-11-15: <b>0.8.1 <a href="http://www.i2p2.i2p/release-0.8.1.html">Released</a></b></h3>
+<h3>2010-12-22: <b>0.8.2 <a href="http://www.i2p2.i2p/release-0.8.2.html">Released</a></b></h3>
 <p>
-The 0.8.1 release contains the usual collection of bug fixes,
+The 0.8.2 release includes extensive bug fixes and theme updates in the router and in i2psnark.
-and a newly colorful i2psnark theme by dr|zed.
+There are also optimizations to reduce memory usage in i2psnark.
-For increased security, files created by the router will now be readable only by the owner (mode 600).
+The HTTP and SOCKS proxies now support local and remote authorization.
 As usual, upgrading is recommended.
 </p><p>
-We have updated all our <a href="http://www.i2p2.i2p/how">technical specifications</a>
+I2P will be at 27C3 in Berlin the week of the December 27th.
-and <a href="http://docs.i2p2.de/javadoc/">Javadocs</a>, check them out.
+Look for the I2P people there and ask for I2P stickers!
-
+</p><p>
-Please help grow the network!
+Please help grow the network.
 Say hello to the volunteers on the <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
-Give the
+<a href="http://www.i2p2.i2p/getinvolved.html">Get involved</a>,
-developers feedback on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a> or <a href="http://forum.i2p">forum.i2p</a>
-and <a href="http://www.i2p2.i2p/getinvolved.html">get involved</a>,
 spread the word,
 and <a href="http://www.i2p2.i2p/donate.html">donate</a>!
+If you find a bug, please enter a report on <a href="http://trac.i2p2.i2p/report/1">trac</a>.
 We are still looking for volunteers to work on new and existing translations.
 Please volunteer on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a>.
 </p>

installer/resources/themes/console/classic/console.css

@@ -407,6 +407,10 @@ div.news li {
      text-transform: capitalize;
 }
 
+div.news h3 {
+     text-align: left !important;
+}
+
 div.news p {
      color: #330;
      font-size: 9pt;

installer/resources/themes/console/dark/console.css

@@ -356,6 +356,10 @@ div.news li {
      text-transform: capitalize;
 }
 
+div.news h3 {
+     text-align: left !important;
+}
+
 div.news h4 {
      border-bottom: 1px;
      border-bottom-style: dotted;

installer/resources/themes/console/light/console.css

@@ -368,6 +368,10 @@ div.news p {
      padding: 0 15px;
 }
 
+div.news h3 {
+     text-align: left !important;
+}
+
 /*
 div.news a:link{
      color: #a30;
@@ -768,7 +772,6 @@ h2 {
      margin: 15px 0px 15px 0 !important;
      -moz-box-shadow: 0 1px 1px 1px rgba(176, 176, 216, 0.4);
      word-wrap: break-word;
-     text-transform: uppercase;
      opacity: 1;
 }
 
@@ -791,8 +794,6 @@ h3 {
      -moz-border-radius: 0 4px 4px 0;
      -khtml-border-radius: 0 4px 4px 0;
      background: #ffe url('images/header.png') center center repeat-x !important;
-     text-transform: uppercase;
-     text-shadow: 0px 0px 1px #77f;
      font-size: 11pt;
      color: #000;
      -moz-box-shadow: 0 1px 1px 1px rgba(176, 176, 216, 0.4);
@@ -865,7 +866,7 @@ button:active{
 }
 
 .langbox img {
-     opacity: 0.7 !important;
+     opacity: 0.8 !important;
      -moz-box-shadow: 0 0 1px #447;
 }
 

installer/resources/themes/console/light/default.css

@@ -47,7 +47,6 @@ h4 {
      margin: 5px 0 15px 0;
      padding: 5px 10px;
      background: #eef url(images/header.png) repeat-x center center;
-     text-transform: uppercase;
      letter-spacing: 0.08em;
      -moz-box-shadow: inset 0px 0px 4px 0px #bbf;
      -moz-border-radius: 4px;

installer/resources/themes/console/midnight/console.css

@@ -431,6 +431,10 @@ div.news li {
      font-weight: bold;
 }
 
+div.news h3 {
+     text-align: left !important;
+}
+
 div.news p {
      color: #eef;
      font-size: 9pt;

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 40;
+    public final static long BUILD = 0;
 
     /** for example "-test" */
-    public final static String EXTRA = "-rc";
+    public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -181,7 +181,7 @@ public class Reseeder {
             if (defaulted && !SSLDisable) {
                 // put the non-SSL at the end of the SSL
                 List<String> URLList2 = new ArrayList();
-                tok = new StringTokenizer(DEFAULT_SSL_SEED_URL, " ,");
+                tok = new StringTokenizer(DEFAULT_SEED_URL, " ,");
                 while (tok.hasMoreTokens())
                     URLList2.add(tok.nextToken().trim());
                 Collections.shuffle(URLList2);

router/java/src/net/i2p/router/startup/WorkingDir.java

@@ -150,7 +150,7 @@ public class WorkingDir {
         success &= migrateJettyXml(oldDirf, dirf);
         success &= migrateClientsConfig(oldDirf, dirf);
         // for later news.xml updates (we don't copy initialNews.xml over anymore)
-        success &= (new SecureDirectory(dirf, "docs")) .mkdir();
+        success &= (new SecureDirectory(dirf, "docs")).mkdir();
 
         // Report success or failure
         if (success) {