Changeset 0cdff150


Ignore:
Timestamp:
Mar 2, 2012 12:18:54 AM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
f62c304
Parents:
75eda7e (diff), 5e5e4f6 (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:

propagate from branch 'i2p.i2p.zzz.test' (head 44ecb300f6f5655b9b8699049d2fba046822deed)

to branch 'i2p.i2p' (head 5120d6c371d7cba9f201b48a142b0e0ead028cdd)

Files:
1 deleted
11 edited

Legend:

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

    r75eda7e r0cdff150  
    14471447            out.write("\"");
    14481448            if (times[i] == delay)
    1449                 out.write(" selected=\"true\"");
     1449                out.write(" selected=\"selected\"");
    14501450            out.write(">");
    14511451            if (times[i] > 0)
     
    14701470        out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
    14711471        if (seedPct <= 0)
    1472             out.write("<option value=\"0\" selected=\"true\">Unlimited</option>\n\t");
     1472            out.write("<option value=\"0\" selected=\"selected\">Unlimited</option>\n\t");
    14731473        else
    14741474            out.write("<option value=\"0\">Unlimited</option>\n\t");
    14751475        if (seedPct == 100)
    1476             out.write("<option value=\"100\" selected=\"true\">100%</option>\n\t");
     1476            out.write("<option value=\"100\" selected=\"selected\">100%</option>\n\t");
    14771477        else
    14781478            out.write("<option value=\"100\">100%</option>\n\t");
    14791479        if (seedPct == 150)
    1480             out.write("<option value=\"150\" selected=\"true\">150%</option>\n\t");
     1480            out.write("<option value=\"150\" selected=\"selected\">150%</option>\n\t");
    14811481        else
    14821482            out.write("<option value=\"150\">150%</option>\n\t");
     
    15551555        out.write("<tr><td>");
    15561556        out.write(_("I2CP options"));
    1557         out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" wrap=\"off\" spellcheck=\"false\" >"
     1557        out.write(": <td><textarea name=\"i2cpOpts\" cols=\"60\" rows=\"1\" style=\"whitespace:nowrap\" spellcheck=\"false\" >"
    15581558                  + opts.toString() + "</textarea><br>\n" +
    15591559
     
    17161716            buf.append("<option value=\"").append(i).append("\" ");
    17171717            if (i == now)
    1718                 buf.append("selected=\"true\" ");
     1718                buf.append("selected=\"selected\" ");
    17191719            // constants to prevent tagging
    17201720            buf.append(">").append(ngettext(DUMMY1 + name, DUMMY0 + name + 's', i));
  • apps/i2ptunnel/jsp/wizard.jsp

    r75eda7e r0cdff150  
    22    // NOTE: Do the header carefully so there is no whitespace before the <?xml... line
    33
     4    // http://www.crazysquirrel.com/computing/general/form-encoding.jspx
     5    if (request.getCharacterEncoding() == null)
     6        request.setCharacterEncoding("UTF-8");
     7
    48%><%@page pageEncoding="UTF-8"
    5 %><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.WizardBean"
     9%><%@page contentType="text/html" import="net.i2p.i2ptunnel.web.EditBean"
    610%><?xml version="1.0" encoding="UTF-8"?>
    711<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
    8 <jsp:useBean class="net.i2p.i2ptunnel.web.WizardBean" id="wizardBean" scope="request" />
     12<jsp:useBean class="net.i2p.i2ptunnel.web.EditBean" id="editBean" scope="request" />
    913<jsp:useBean class="net.i2p.i2ptunnel.web.Messages" id="intl" scope="request" />
    1014<% String pageStr = request.getParameter("page");
     
    5155    <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
    5256
    53     <% if (wizardBean.allowCSS()) {
    54   %><link href="<%=wizardBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
    55     <link href="<%=wizardBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
     57    <% if (editBean.allowCSS()) {
     58  %><link href="<%=editBean.getTheme()%>default.css" rel="stylesheet" type="text/css" />
     59    <link href="<%=editBean.getTheme()%>i2ptunnel.css" rel="stylesheet" type="text/css" />
    5660    <% }
    5761  %>
     
    8387                <input type="hidden" name="page" value="<%=curPage%>" />
    8488                <input type="hidden" name="tunnel" value="null" />
    85                 <input type="hidden" name="nonce" value="<%=wizardBean.getNextNonce()%>" />
     89                <input type="hidden" name="nonce" value="<%=editBean.getNextNonce()%>" />
    8690            </div>
    8791
     
    342346                      clientInterface = "127.0.0.1";
    343347                    }
    344                     for (String ifc : wizardBean.interfaceSet()) {
     348                    for (String ifc : editBean.interfaceSet()) {
    345349                        out.write("<option value=\"");
    346350                        out.write(ifc);
     
    426430                </td></tr>
    427431                <tr><td><%=intl._("Tunnel name and description")%></td><td>
    428                     <%=request.getParameter("name")%><br>
     432                    <%=request.getParameter("name")%><br />
    429433                    <%=request.getParameter("description")%>
    430434                </td></tr><%
     
    440444                <tr><td><%=intl._("Binding address and port")%></td><td><%
    441445                if ((tunnelIsClient && "streamrclient".equals(tunnelType)) || (!tunnelIsClient && !"streamrserver".equals(tunnelType))) { %>
    442                     <%=request.getParameter("targetHost")%><br><%
     446                    <%=request.getParameter("targetHost")%><br /><%
    443447                }
    444448                if (!tunnelIsClient) { %>
    445                     <%=request.getParameter("targetPort")%><br><%
     449                    <%=request.getParameter("targetPort")%><br /><%
    446450                }
    447451                if (tunnelIsClient || "httpbidirserver".equals(tunnelType)) { %>
    448                     <br><%=request.getParameter("port")%><%
     452                    <br /><%=request.getParameter("port")%><%
    449453                }
    450454                if ((tunnelIsClient && !"streamrclient".equals(tunnelType)) || "httpbidirserver".equals(tunnelType) || "streamrserver".equals(tunnelType)) { %>
    451                     <br><%=request.getParameter("reachableBy")%><%
     455                    <br /><%=request.getParameter("reachableBy")%><%
    452456                } %>
    453457                </td></tr>
  • apps/routerconsole/jsp/confignet.jsp

    r75eda7e r0cdff150  
    4747    <% String[] ips = nethelper.getAddresses();
    4848       if (ips.length > 0) {
    49            out.print(intl._("or") + " <select name=\"udpHost2\"><option value=\"\" selected=\"true\">"+intl._("Select Interface")+"</option>\n");
     49           out.print(intl._("or") + " <select name=\"udpHost2\"><option value=\"\" selected=\"selected\">"+intl._("Select Interface")+"</option>\n");
    5050           for (int i = 0; i < ips.length; i++) {
    5151               out.print("<option value=\"");
  • core/java/src/net/i2p/CoreVersion.java

    r75eda7e r0cdff150  
    1717    /** deprecated */
    1818    public final static String ID = "Monotone";
    19     public final static String VERSION = "0.8.12";
     19    public final static String VERSION = "0.8.13";
    2020
    2121    public static void main(String args[]) {
  • debian/changelog

    r75eda7e r0cdff150  
     1i2p (0.8.13-1) stable; urgency=low
     2
     3  * New upstream version 0.8.13
     4  * Packages are compressed with bzip2
     5  * Remove debian/patches/0005-EepGet_correct_status.patch
     6  * Bump standards version to 3.9.3 (no changes to source needed)
     7  * Debconf:
     8    - New Czech language translation
     9    - Updated German, Polish, Russian, and Ukrainian translations
     10
     11 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 Feb 2012 21:06:56 +0000
     12
    113i2p (0.8.12-2) stable; urgency=low
    214
  • debian/control

    r75eda7e r0cdff150  
    22Maintainer: Kill Your TV <killyourtv@i2pmail.org>
    33Section: net
    4 Standards-Version: 3.9.2
     4Standards-Version: 3.9.3
    55Priority: optional
    66Bugs: mailto:killyourtv@i2pmail.org
  • debian/rules

    r75eda7e r0cdff150  
    6969build-arch:
    7070        # build jbigi
    71         cd $(CURDIR)/core/c/jbigi && ./mbuild_jbigi.sh dynamic
     71        cd $(CURDIR)/core/c/jbigi && ./build_jbigi.sh dynamic
    7272        # build jcpuid
    7373        cd $(CURDIR)/core/c/jcpuid && ./build.sh
  • history.txt

    r75eda7e r0cdff150  
     1* 2012-02-27 0.8.13 released
     2
    132012-02-22 kytv
    24  * Updated German, Italian, Spanish, Swedish, and Ukrainian translations
  • installer/install.xml

    r75eda7e r0cdff150  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.8.12</appversion>
     7        <appversion>0.8.13</appversion>
    88        <authors>
    99            <author name="I2P" email="http://forum.i2p2.de/"/>
  • installer/resources/news.xml

    r75eda7e r0cdff150  
    11<!--
    22<i2p.news date="$Date: 2012-01-06 00:00:00 $">
    3 <i2p.release version="0.8.12" date="2012/01/06" minVersion="0.6" />
     3<i2p.release version="0.8.13" date="2012/02/27" minVersion="0.6" />
    44-->
    55<div lang="en">
    6 <h3>2012-01-06: <b>0.8.12 <a href="http://www.i2p2.i2p/release-0.8.12.html">Released</a></b></h3>
     6<h3>2012-02-27: <b>0.8.13 <a href="http://www.i2p2.i2p/release-0.8.13.html">Released</a></b></h3>
    77
    88<p>
    9 The 0.8.12 release fixes several serious message corruption bugs.
    10 It also contains a redesign of the router's congestion control, and continued
    11 optimization of CPU and memory usage. We are hopeful that these changes will
    12 improve network performance. Upgrading is recommended.
     9The 0.8.13 release contains several bug fixes and a couple of new features.
     10We are pleased that the last release significantly improved performance,
     11and the network is running well despite continued rapid growth.
     12Upgrading is recommended.
     13</p><p>
     14This is likely to be the last release before 0.9, in which we will migrate to Jetty 6,
     15and introduce a simplified router console home page. Monitor the news section of
     16your the router console in the coming weeks for more information on the next release.
     17</p><p>
     18Starting with this release, the router will
     19check for and install plugin updates shortly upon restarting after a router update.
     20To prevent this, add the <a href="/configadvanced">advanced configuration</a>
     21<tt>plugins.autoUpdate=false</tt> before restarting.
     22There is also a new update-all button on <a href="/configclients#plugin">the client configuration page</a>.
     23</p><p>
     24Routers in certain countries will now automatically enable hidden mode for increased protection.
     25However, hidden mode may have lower performance or reliability, and is still a work in progress.
     26To disable hidden mode before restarting, add the <a href="/configadvanced">advanced configuration</a>
     27<tt>router.isHidden=false</tt>.
     28To disable hidden mode later, select <i>use all auto-detect methods</i> under <i>IP Configuration</i> on the
     29<a href="/confignet">network configuration page</a>.
     30For the list of countries see <a href="http://zzz.i2p/topics/969">this thread on zzz.i2p</a>.
     31The only country on the list that has more than one or two I2P users is China.
     32</p><p>
     33After you have upgraded, check out the <a href="/i2ptunnel/wizard">new tunnel creation wizard</a>.
    1334</p><p>
    1435Say hello to the volunteers on the <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
  • router/java/src/net/i2p/router/RouterVersion.java

    r75eda7e r0cdff150  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 18;
     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[]) {
Note: See TracChangeset for help on using the changeset viewer.