Changeset 4e3effa


Ignore:
Timestamp:
Dec 22, 2010 12:03:56 AM (9 years ago)
Author:
z3d <z3d@…>
Branches:
master
Children:
5d2f5c7a
Parents:
a825132 (diff), f02a0d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '878149500938c6886eb9e0274ba0901e8fe3a3bb'

and 'deab42b1e2bfe970ba51a868ab2b8c47181fdd15'

Files:
1 deleted
19 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/PartialPiece.java

    ra825132 r4e3effa  
    88 * a piece is not completely downloaded, for example
    99 * when the Peer disconnects or chokes.
     10 *
     11 * @since 0.8.2
    1012 */
    1113class PartialPiece implements Comparable {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

    ra825132 r4e3effa  
    3232                           boolean ownDest, EventDispatcher notifyThis,
    3333                           I2PTunnel tunnel, String pkf) throws IllegalArgumentException {
    34         super(localPort, ownDest, l, notifyThis, "SynSender", tunnel, pkf);
     34        super(localPort, ownDest, l, notifyThis,
     35              "Standard client on " + tunnel.listenHost + ':' + localPort,
     36              tunnel, pkf);
    3537
    3638        if (waitEventValue("openBaseClientResult").equals("error")) {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

    ra825132 r4e3effa  
    7474    }
    7575
    76     /** all auth @ince 0.8.2 */
     76    /** all auth @since 0.8.2 */
    7777    public static final String PROP_AUTH = "proxyAuth";
    7878    public static final String PROP_USER = "proxyUsername";
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

    ra825132 r4e3effa  
    356356            _log.debug("Read the http command [" + command.toString() + "]");
    357357       
     358        // FIXME we probably don't need or want this in the outgoing direction
    358359        int trimmed = 0;
    359360        if (command.length() > 0) {
     
    395396                    name = "X-Accept-encoding";
    396397
    397                 //We want to remove certain headers to improve anonymity
     398                // For incoming, we remove certain headers to prevent spoofing.
     399                // For outgoing, we remove certain headers to improve anonymity.
    398400                boolean skip = false;
    399401                for (String skipHeader: skipHeaders) {
  • build.xml

    ra825132 r4e3effa  
    530530    <!-- readme and proxy error page files, initialNews.xml files, GeoIP files, and flag icons -->
    531531    <target name="prepConsoleDocs" depends="prepConsoleDocUpdates, prepgeoupdate" >
    532         <copy todir="pkg-temp/docs/" >
     532        <copy todir="pkg-temp/docs/initialNews/">
    533533          <fileset dir="installer/resources/initialNews/" />
    534534        </copy>
  • core/java/src/net/i2p/CoreVersion.java

    ra825132 r4e3effa  
    1717    /** deprecated */
    1818    public final static String ID = "Monotone";
    19     public final static String VERSION = "0.8.1";
     19    public final static String VERSION = "0.8.2";
    2020
    2121    public static void main(String args[]) {
  • core/java/src/net/i2p/data/SimpleDataStructure.java

    ra825132 r4e3effa  
    2929    protected final int _length;
    3030   
    31     /** A new instance with the data set to null. Call readBytes(), setData(), or from ByteArray() after this to set the data */
     31    /** A new instance with the data set to null. Call readBytes(), setData(), or fromByteArray() after this to set the data */
    3232    public SimpleDataStructure() {
    3333        _length = length();
  • history.txt

    ra825132 r4e3effa  
    1 2010-12-19 sponge
    2     * Fix missing </A> in Resource.java
    3     * Fix URI.java parse issue
    4     * Fix FileResource.java logic bug
     1* 2010-12-22  0.8.2 released
    52
    632010-12-13 dr|z3d
  • installer/install.xml

    ra825132 r4e3effa  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.8.1</appversion>
     7        <appversion>0.8.2</appversion>
    88        <authors>
    99            <author name="I2P" email="http://forum.i2p2.de/"/>
  • installer/resources/news.xml

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

    ra825132 r4e3effa  
    406406     color: #540;
    407407     text-transform: capitalize;
     408}
     409
     410div.news h3 {
     411     text-align: left !important;
    408412}
    409413
  • installer/resources/themes/console/dark/console.css

    ra825132 r4e3effa  
    357357}
    358358
     359div.news h3 {
     360     text-align: left !important;
     361}
     362
    359363div.news h4 {
    360364     border-bottom: 1px;
  • installer/resources/themes/console/light/console.css

    ra825132 r4e3effa  
    367367     margin-top: -7px;
    368368     padding: 0 15px;
     369}
     370
     371div.news h3 {
     372     text-align: left !important;
    369373}
    370374
     
    769773     -moz-box-shadow: 0 1px 1px 1px rgba(176, 176, 216, 0.4);
    770774     word-wrap: break-word;
    771      text-transform: uppercase;
    772775     opacity: 1;
    773776}
     
    792795     -khtml-border-radius: 0 4px 4px 0;
    793796     background: #ffe url('images/header.png') center center repeat-x !important;
    794      text-transform: uppercase;
    795      text-shadow: 0px 0px 1px #77f;
    796797     font-size: 11pt;
    797798     color: #000;
     
    866867
    867868.langbox img {
    868      opacity: 0.7 !important;
     869     opacity: 0.8 !important;
    869870     -moz-box-shadow: 0 0 1px #447;
    870871}
  • installer/resources/themes/console/light/default.css

    ra825132 r4e3effa  
    4848     padding: 5px 10px;
    4949     background: #eef url(images/header.png) repeat-x center center;
    50      text-transform: uppercase;
    5150     letter-spacing: 0.08em;
    5251     -moz-box-shadow: inset 0px 0px 4px 0px #bbf;
  • installer/resources/themes/console/midnight/console.css

    ra825132 r4e3effa  
    432432}
    433433
     434div.news h3 {
     435     text-align: left !important;
     436}
     437
    434438div.news p {
    435439     color: #eef;
  • router/java/src/net/i2p/router/RouterVersion.java

    ra825132 r4e3effa  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 40;
     21    public final static long BUILD = 0;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    ra825132 r4e3effa  
    182182                // put the non-SSL at the end of the SSL
    183183                List<String> URLList2 = new ArrayList();
    184                 tok = new StringTokenizer(DEFAULT_SSL_SEED_URL, " ,");
     184                tok = new StringTokenizer(DEFAULT_SEED_URL, " ,");
    185185                while (tok.hasMoreTokens())
    186186                    URLList2.add(tok.nextToken().trim());
  • router/java/src/net/i2p/router/startup/WorkingDir.java

    ra825132 r4e3effa  
    151151        success &= migrateClientsConfig(oldDirf, dirf);
    152152        // for later news.xml updates (we don't copy initialNews.xml over anymore)
    153         success &= (new SecureDirectory(dirf, "docs")) .mkdir();
     153        success &= (new SecureDirectory(dirf, "docs")).mkdir();
    154154
    155155        // Report success or failure
Note: See TracChangeset for help on using the changeset viewer.