zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

merge of '8c5085970b330a592129aa2da5a473d318426bbb'

Browse Source 
and 'f11c600b339d0742fb91a87df7322ec4b84eee4d'
This commit is contained in:
dev
2010-06-08 15:37:25 +00:00
parent d5aaff7f06 746bad3c30
commit e065d2b01e
12 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
View File

@@ -27,7 +27,6 @@ class ConnThrottler {
ConnThrottler(int max, int totalMax, long period) {
_max = max;
_totalMax = totalMax;
SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period);
if (max > 0)
this.counter = new ObjectCounter();
else
@@ -36,6 +35,7 @@ class ConnThrottler {
_currentTotal = new AtomicInteger();
else
_currentTotal = null;
SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period);
}
/** increments before checking */

2
build.xml
View File

@@ -722,7 +722,7 @@
<!-- this is the same dependency as pkg, but with updater200 in the middle,
since preppkg puts too much stuff in pkg-temp -->
<target name="release" depends="distclean, updaterWithJettyFixes, updater200WithJettyFixes, preppkg, installer" >
<target name="release" depends="distclean, updater, updater200, preppkg, installer" >
<echo message="================================================================" />
<echo message="Did you update these files?" />
<exec executable="ls" failonerror="true">

2
core/java/src/net/i2p/CoreVersion.java
View File

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

2
core/java/src/net/i2p/util/Translate.java
View File

@@ -110,7 +110,7 @@ public abstract class Translate {
*
* @param n how many
* @param s singluar string, optionally with {0} e.g. "one tunnel"
* @param s plural string optionally with {0} e.g. "{0} tunnels"
* @param p plural string optionally with {0} e.g. "{0} tunnels"
* @since 0.7.14
*/
public static String getString(int n, String s, String p, I2PAppContext ctx, String bun) {

5
history.txt
View File

@@ -1,3 +1,8 @@
* 2010-06-07 0.7.14 released
2010-06-07 zzz
* Misc tweaks after code review
2010-06-05 zzz
* Netdb:
- Use new receivedAsReply flag in LeaseSet to mark

2
installer/install.xml
View File

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

4
installer/resources/initialNews.xml
View File

@@ -1,6 +1,6 @@
<!--
<i2p.news date="$Date: 2010-04-27 00:00:00 $">
<i2p.release version="0.7.13" date="2010/04/27" minVersion="0.6"/>
<i2p.news date="$Date: 2010-06-07 00:00:00 $">
<i2p.release version="0.7.14" date="2010/06/07" minVersion="0.6"/>
-->
<h4><ul><li>Congratulations on getting I2P installed!</li></ul></h4>
<p>

23
installer/resources/news.xml
View File

@@ -1,17 +1,20 @@
<!--
<i2p.news date="$Date: 2010-04-27 00:00:00 $">
<i2p.release version="0.7.13" date="2010/04/27" minVersion="0.6" />
<i2p.news date="$Date: 2010-06-07 00:00:00 $">
<i2p.release version="0.7.14" date="2010/06/07" minVersion="0.6" />
-->
<h4><ul><li>2010-04-27: <b>0.7.13 <a href="http://www.i2p2.i2p/release-0.7.13.html">Released</a></b></li></ul></h4>
<h4><ul><li>2010-06-07: <b>0.7.14 <a href="http://www.i2p2.i2p/release-0.7.14.html">Released</a></b></li></ul></h4>
<p>
The 0.7.13 release contains several changes and bug fixes to improve performance.
It also includes improvements for the plugin support that was
introduced in the last release.
The new, smaller tunnel build message is enabled,
to reduce overhead and increase build success.
</p><p>
Of course, there is the usual assortment of bug fixes as well.
The 0.7.14 release contains the usual collection of bug fixes and performance tweaks.
There are also some i2psnark improvements and more fixes for plugins.
Upgrading is recommended.
</p><p>
Important note: Due to a bug in 0.7.13 and earlier releases, clicking 'Download 0.7.14 Update'
in your router console summary bar, when you have the summary bar refresh enabled,
may result in multiple downloads of the update. Please disable the summary bar refresh
before clicking the download button.
If your update policy is set to 'Download and Verify Only' (the default) then
you should not have a problem, the router will download the file once.
</p><p>
Please help grow the network!
Say hello to the volunteers on the new <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
Give the

3
installer/resources/themes/console/light/default.css
View File

@@ -47,7 +47,6 @@ h4 {
padding: 5px 10px;
background: #b4c8ff url(images/tabletitlelight.png) repeat-x;
text-transform: uppercase;
text-shadow: 0px 0px 2px rgba(64, 64, 255, 0.9);
letter-spacing: 0.08em;
-moz-box-shadow: inset 0px 0px 4px 0px #bbf;
-moz-border-radius: 4px;
@@ -370,4 +369,4 @@ a:active{
color: #f93;
text-decoration: underline;
font-weight: bold;
}
}

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -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 = 18;
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);

2
router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
View File

@@ -386,7 +386,7 @@ public class EventPumper implements Runnable {
// don't throw an NPE if the connect is gone again
if(chan == null)
return;
chan.configureBlocking(false);;
chan.configureBlocking(false);
if (!_transport.allowConnection()) {
if (_log.shouldLog(Log.WARN))

1
router/java/src/net/i2p/router/transport/ntcp/Reader.java
View File

@@ -17,6 +17,7 @@ import net.i2p.util.Log;
class Reader {
private RouterContext _context;
private Log _log;
// TODO change to LBQ ??
private final List<NTCPConnection> _pendingConnections;
private List<NTCPConnection> _liveReads;
private List<NTCPConnection> _readAfterLive;