diff --git a/LICENSE.txt b/LICENSE.txt index 741c1ea51..646821e33 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -177,7 +177,7 @@ Applications: By welterde. See licenses/LICENSE-GPLv2.txt - Jetty 7.6.10.v20130312: + Jetty 7.6.11.v20130520: See licenses/ABOUT-Jetty.html See licenses/NOTICE-Jetty.html See licenses/LICENSE-Apache2.0.txt @@ -243,8 +243,8 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 6.0.36: - Copyright 1999-2012 The Apache Software Foundation + Tomcat 6.0.37: + Copyright 1999-2013 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/apps/jetty/apache-tomcat-deployer/NOTICE b/apps/jetty/apache-tomcat-deployer/NOTICE index aaa19b6a8..908b08c4f 100644 --- a/apps/jetty/apache-tomcat-deployer/NOTICE +++ b/apps/jetty/apache-tomcat-deployer/NOTICE @@ -1,5 +1,5 @@ Apache Tomcat -Copyright 1999-2012 The Apache Software Foundation +Copyright 1999-2013 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar index 7503cdabd..2cd4602ed 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/el-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/el-api.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar index c51e275e2..7a1afca20 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper-el.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar index 47284070c..81db34669 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jasper.jar and b/apps/jetty/apache-tomcat-deployer/lib/jasper.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar b/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar index 303045954..a4d236913 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/jsp-api.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar b/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar index 44f490c6a..c9cb9b625 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar and b/apps/jetty/apache-tomcat-deployer/lib/servlet-api.jar differ diff --git a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar index 2fcbafd9d..9d1273ee6 100644 Binary files a/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar and b/apps/jetty/apache-tomcat-deployer/lib/tomcat-juli.jar differ diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 940d82e6e..cfcd6ca9c 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -1,9 +1,9 @@ - + - + diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PDigestAuthenticator.java b/apps/jetty/java/src/net/i2p/jetty/I2PDigestAuthenticator.java deleted file mode 100644 index f749effe1..000000000 --- a/apps/jetty/java/src/net/i2p/jetty/I2PDigestAuthenticator.java +++ /dev/null @@ -1,434 +0,0 @@ -// -// ======================================================================== -// Copyright (c) 1995-2013 Mort Bay Consulting Pty. Ltd. -// ------------------------------------------------------------------------ -// All rights reserved. This program and the accompanying materials -// are made available under the terms of the Eclipse Public License v1.0 -// and Apache License v2.0 which accompanies this distribution. -// -// The Eclipse Public License is available at -// http://www.eclipse.org/legal/epl-v10.html -// -// The Apache License v2.0 is available at -// http://www.opensource.org/licenses/apache2.0.php -// -// You may elect to redistribute this code under either of these licenses. -// ======================================================================== -// - -package net.i2p.jetty; - -import java.io.IOException; -import java.security.MessageDigest; -import java.security.SecureRandom; -import java.util.Queue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ConcurrentMap; - -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.http.HttpHeaders; -import org.eclipse.jetty.security.SecurityHandler; -import org.eclipse.jetty.security.ServerAuthException; -import org.eclipse.jetty.security.UserAuthentication; -import org.eclipse.jetty.security.authentication.DeferredAuthentication; -import org.eclipse.jetty.security.authentication.DigestAuthenticator; -import org.eclipse.jetty.server.Authentication; -import org.eclipse.jetty.server.Authentication.User; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.UserIdentity; -import org.eclipse.jetty.util.B64Code; -import org.eclipse.jetty.util.QuotedStringTokenizer; -import org.eclipse.jetty.util.StringUtil; -import org.eclipse.jetty.util.TypeUtil; -import org.eclipse.jetty.util.log.Log; -import org.eclipse.jetty.util.log.Logger; -import org.eclipse.jetty.util.security.Constraint; -import org.eclipse.jetty.util.security.Credential; - -/** - * I2P fixes for out-of-order nonce counts. - * Based on DigestAuthenticator in Jetty 7.6.10. - * Includes the nonce count verification code from Tomcat 7.0.35. - * ref: http://jira.codehaus.org/browse/JETTY-1468 which was closed not-a-bug. - * ref: https://bugs.eclipse.org/bugs/show_bug.cgi?id=336443 in which the - * Jetty implementation was introduced. - * - * @since 0.9.6 - * - * @version $Rev: 4793 $ $Date: 2009-03-19 00:00:01 +0100 (Thu, 19 Mar 2009) $ - * - * The nonce max age in ms can be set with the {@link SecurityHandler#setInitParameter(String, String)} - * using the name "maxNonceAge" - */ -public class I2PDigestAuthenticator extends DigestAuthenticator -{ - // shadows super - private static final Logger LOG = Log.getLogger(I2PDigestAuthenticator.class); - SecureRandom _random = new SecureRandom(); - // shadows super - private long _maxNonceAgeMs = 60*60*1000L; - private ConcurrentMap _nonceCount = new ConcurrentHashMap(); - // shadows super - private Queue _nonceQueue = new ConcurrentLinkedQueue(); - - /* - * Shadows super - * - * Contains code from Tomcat 7.0.35 DigestAuthenticator.NonceInfo - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - private static class Nonce - { - final String _nonce; - final long _ts; - private volatile boolean seen[]; - private volatile int offset; - private volatile int count = 0; - private static final int seenWindowSize = 100; - - public Nonce(String nonce, long ts) - { - _nonce=nonce; - _ts=ts; - seen = new boolean[seenWindowSize]; - offset = seenWindowSize / 2; - } - - public synchronized boolean nonceCountValid(long nonceCount) { - if ((count - offset) >= nonceCount || - (nonceCount > count - offset + seen.length)) { - return false; - } - int checkIndex = (int) ((nonceCount + offset) % seen.length); - if (seen[checkIndex]) { - return false; - } else { - seen[checkIndex] = true; - seen[count % seen.length] = false; - count++; - return true; - } - } - } - - /* ------------------------------------------------------------ */ - public I2PDigestAuthenticator() - { - super(); - } - - - /* ------------------------------------------------------------ */ - - /** - * Store local copy since field in super is private - */ - @Override - public synchronized void setMaxNonceAge(long maxNonceAgeInMillis) - { - super.setMaxNonceAge(maxNonceAgeInMillis); - _maxNonceAgeMs = maxNonceAgeInMillis; - } - - /* ------------------------------------------------------------ */ - - /** - * No changes from super - */ - @Override - public Authentication validateRequest(ServletRequest req, ServletResponse res, boolean mandatory) throws ServerAuthException - { - if (!mandatory) - return new DeferredAuthentication(this); - - HttpServletRequest request = (HttpServletRequest)req; - HttpServletResponse response = (HttpServletResponse)res; - String credentials = request.getHeader(HttpHeaders.AUTHORIZATION); - - try - { - boolean stale = false; - if (credentials != null) - { - if (LOG.isDebugEnabled()) - LOG.debug("Credentials: " + credentials); - QuotedStringTokenizer tokenizer = new QuotedStringTokenizer(credentials, "=, ", true, false); - final Digest digest = new Digest(request.getMethod()); - String last = null; - String name = null; - - while (tokenizer.hasMoreTokens()) - { - String tok = tokenizer.nextToken(); - char c = (tok.length() == 1) ? tok.charAt(0) : '\0'; - - switch (c) - { - case '=': - name = last; - last = tok; - break; - case ',': - name = null; - break; - case ' ': - break; - - default: - last = tok; - if (name != null) - { - if ("username".equalsIgnoreCase(name)) - digest.username = tok; - else if ("realm".equalsIgnoreCase(name)) - digest.realm = tok; - else if ("nonce".equalsIgnoreCase(name)) - digest.nonce = tok; - else if ("nc".equalsIgnoreCase(name)) - digest.nc = tok; - else if ("cnonce".equalsIgnoreCase(name)) - digest.cnonce = tok; - else if ("qop".equalsIgnoreCase(name)) - digest.qop = tok; - else if ("uri".equalsIgnoreCase(name)) - digest.uri = tok; - else if ("response".equalsIgnoreCase(name)) - digest.response = tok; - name=null; - } - } - } - - int n = checkNonce(digest,(Request)request); - - if (n > 0) - { - UserIdentity user = _loginService.login(digest.username,digest); - if (user!=null) - { - renewSession(request,response); - return new UserAuthentication(getAuthMethod(),user); - } - } - else if (n == 0) - stale = true; - - } - - if (!DeferredAuthentication.isDeferred(response)) - { - String domain = request.getContextPath(); - if (domain == null) - domain = "/"; - response.setHeader(HttpHeaders.WWW_AUTHENTICATE, "Digest realm=\"" + _loginService.getName() - + "\", domain=\"" - + domain - + "\", nonce=\"" - + newNonce((Request)request) - + "\", algorithm=MD5, qop=\"auth\"," - + " stale=" + stale); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED); - - return Authentication.SEND_CONTINUE; - } - - return Authentication.UNAUTHENTICATED; - } - catch (IOException e) - { - throw new ServerAuthException(e); - } - - } - - /* ------------------------------------------------------------ */ - - /** - * No changes from super - */ - @Override - public String newNonce(Request request) - { - Nonce nonce; - - do - { - byte[] nounce = new byte[24]; - _random.nextBytes(nounce); - - nonce = new Nonce(new String(B64Code.encode(nounce)),request.getTimeStamp()); - } - while (_nonceCount.putIfAbsent(nonce._nonce,nonce)!=null); - _nonceQueue.add(nonce); - - return nonce._nonce; - } - - /** - * @param nstring nonce to check - * @param request - * @return -1 for a bad nonce, 0 for a stale none, 1 for a good nonce - */ - /* ------------------------------------------------------------ */ - - /** - * Contains fixes - */ - private int checkNonce(Digest digest, Request request) - { - // firstly let's expire old nonces - long expired; - synchronized (this) - { - expired = request.getTimeStamp()-_maxNonceAgeMs; - } - - Nonce nonce=_nonceQueue.peek(); - while (nonce!=null && nonce._tsInteger.MAX_VALUE) - return 0; - if (!nonce.nonceCountValid(count)) { - return -1; - } - return 1; - } - catch (Exception e) - { - LOG.ignore(e); - } - return -1; - } - - /* ------------------------------------------------------------ */ - /* ------------------------------------------------------------ */ - /* ------------------------------------------------------------ */ - - /** - * Shadows super. - * No changes from super - */ - private static class Digest extends Credential - { - private static final long serialVersionUID = -2484639019549527724L; - final String method; - String username = ""; - String realm = ""; - String nonce = ""; - String nc = ""; - String cnonce = ""; - String qop = ""; - String uri = ""; - String response = ""; - - /* ------------------------------------------------------------ */ - Digest(String m) - { - method = m; - } - - /* ------------------------------------------------------------ */ - @Override - public boolean check(Object credentials) - { - if (credentials instanceof char[]) - credentials=new String((char[])credentials); - String password = (credentials instanceof String) ? (String) credentials : credentials.toString(); - - try - { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] ha1; - if (credentials instanceof Credential.MD5) - { - // Credentials are already a MD5 digest - assume it's in - // form user:realm:password (we have no way to know since - // it's a digest, alright?) - ha1 = ((Credential.MD5) credentials).getDigest(); - } - else - { - // calc A1 digest - md.update(username.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(realm.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(password.getBytes(StringUtil.__ISO_8859_1)); - ha1 = md.digest(); - } - // calc A2 digest - md.reset(); - md.update(method.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(uri.getBytes(StringUtil.__ISO_8859_1)); - byte[] ha2 = md.digest(); - - // calc digest - // request-digest = <"> < KD ( H(A1), unq(nonce-value) ":" - // nc-value ":" unq(cnonce-value) ":" unq(qop-value) ":" H(A2) ) - // <"> - // request-digest = <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) - // ) > <"> - - md.update(TypeUtil.toString(ha1, 16).getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(nonce.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(nc.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(cnonce.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(qop.getBytes(StringUtil.__ISO_8859_1)); - md.update((byte) ':'); - md.update(TypeUtil.toString(ha2, 16).getBytes(StringUtil.__ISO_8859_1)); - byte[] digest = md.digest(); - - // check digest - return (TypeUtil.toString(digest, 16).equalsIgnoreCase(response)); - } - catch (Exception e) - { - LOG.warn(e); - } - - return false; - } - - public String toString() - { - return username + "," + response; - } - } -} diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-continuation-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-continuation-7.6.11.v20130520.jar similarity index 78% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-continuation-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-continuation-7.6.11.v20130520.jar index 2a005f357..5e42aea88 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-continuation-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-continuation-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-deploy-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-deploy-7.6.11.v20130520.jar similarity index 84% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-deploy-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-deploy-7.6.11.v20130520.jar index fc8348071..3ce937c55 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-deploy-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-deploy-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-http-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-http-7.6.11.v20130520.jar similarity index 77% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-http-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-http-7.6.11.v20130520.jar index 005f633a8..790f02f1b 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-http-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-http-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-io-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-io-7.6.11.v20130520.jar similarity index 81% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-io-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-io-7.6.11.v20130520.jar index a730eba48..521015352 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-io-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-io-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-jmx-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-jmx-7.6.11.v20130520.jar similarity index 78% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-jmx-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-jmx-7.6.11.v20130520.jar index b12fd7433..ac9248b5b 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-jmx-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-jmx-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-rewrite-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-rewrite-7.6.11.v20130520.jar similarity index 82% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-rewrite-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-rewrite-7.6.11.v20130520.jar index 39405a9b5..94af60855 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-rewrite-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-rewrite-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-security-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-security-7.6.11.v20130520.jar similarity index 74% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-security-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-security-7.6.11.v20130520.jar index 4802c45e1..a40913fbe 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-security-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-security-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-server-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-server-7.6.11.v20130520.jar similarity index 71% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-server-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-server-7.6.11.v20130520.jar index 9692f6cf2..c7d5e7b6b 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-server-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-server-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlet-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlet-7.6.11.v20130520.jar similarity index 70% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlet-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlet-7.6.11.v20130520.jar index edf67b21e..ec499b22f 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlet-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlet-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlets-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlets-7.6.11.v20130520.jar similarity index 60% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlets-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlets-7.6.11.v20130520.jar index 9618c6a67..af3c08137 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-servlets-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-servlets-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-util-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-util-7.6.11.v20130520.jar similarity index 86% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-util-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-util-7.6.11.v20130520.jar index a7f4e0fee..a562b1988 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-util-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-util-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-webapp-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-webapp-7.6.11.v20130520.jar similarity index 91% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-webapp-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-webapp-7.6.11.v20130520.jar index 45fc501a9..059953950 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-webapp-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-webapp-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-xml-7.6.10.v20130312.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-xml-7.6.11.v20130520.jar similarity index 88% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-xml-7.6.10.v20130312.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-xml-7.6.11.v20130520.jar index d3c90d470..8bafa3af9 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/lib/jetty-xml-7.6.10.v20130312.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/lib/jetty-xml-7.6.11.v20130520.jar differ diff --git a/apps/jetty/jetty-distribution-7.6.10.v20130312/start.jar b/apps/jetty/jetty-distribution-7.6.11.v20130520/start.jar similarity index 90% rename from apps/jetty/jetty-distribution-7.6.10.v20130312/start.jar rename to apps/jetty/jetty-distribution-7.6.11.v20130520/start.jar index ade23eb98..785fa284d 100644 Binary files a/apps/jetty/jetty-distribution-7.6.10.v20130312/start.jar and b/apps/jetty/jetty-distribution-7.6.11.v20130520/start.jar differ diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 4c5095536..627254c89 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -29,7 +29,6 @@ import static net.i2p.app.ClientAppState.*; import net.i2p.apps.systray.SysTray; import net.i2p.data.Base32; import net.i2p.data.DataHelper; -import net.i2p.jetty.I2PDigestAuthenticator; import net.i2p.jetty.I2PLogger; import net.i2p.router.RouterContext; import net.i2p.router.update.ConsoleUpdateManager; @@ -106,7 +105,7 @@ public class RouterConsoleRunner implements RouterApp { private static final String DEFAULT_WEBAPP_CONFIG_FILENAME = "webapps.config"; // Jetty Auth - private static final DigestAuthenticator authenticator = new I2PDigestAuthenticator(); + private static final DigestAuthenticator authenticator = new DigestAuthenticator(); static { // default changed from 0 (forever) in Jetty 6 to 60*1000 ms in Jetty 7 authenticator.setMaxNonceAge(7*24*60*60*1000L); diff --git a/history.txt b/history.txt index 7ef62c2cf..6be38d19d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,9 @@ +2013-05-29 zzz + * Console: Remove I2PDigestAuthenticator workaround, as Jetty 7.6.11 has the fix + * i2ptunnel: Default to 3 hops (ticket #936) + * Jetty 7.6.11 + * Tomcat 6.0.37 + * 2013-05-28 0.9.6 released 2013-05-24 kytv diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a411b0099..87e5bffca 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 0; + public final static long BUILD = 1; /** for example "-test" */ public final static String EXTRA = "";