Merge remote-tracking branch 'origin/master' into jetty-9.2.x

Conflicts: aggregates/jetty-all/pom.xml examples/async-rest/async-rest-jar/pom.xml examples/async-rest/async-rest-webapp/pom.xml examples/async-rest/pom.xml examples/embedded/pom.xml examples/pom.xml jetty-annotations/pom.xml jetty-ant/pom.xml jetty-client/pom.xml jetty-continuation/pom.xml jetty-deploy/pom.xml jetty-distribution/pom.xml jetty-fcgi/fcgi-client/pom.xml jetty-fcgi/fcgi-server/pom.xml jetty-fcgi/pom.xml jetty-http-spi/pom.xml jetty-http/pom.xml jetty-io/pom.xml jetty-jaas/pom.xml jetty-jaspi/pom.xml jetty-jmx/pom.xml jetty-jndi/pom.xml jetty-jsp/pom.xml jetty-jspc-maven-plugin/pom.xml jetty-maven-plugin/pom.xml jetty-monitor/pom.xml jetty-nosql/pom.xml jetty-osgi/jetty-osgi-boot-jsp/pom.xml jetty-osgi/jetty-osgi-boot-warurl/pom.xml jetty-osgi/jetty-osgi-boot/pom.xml jetty-osgi/jetty-osgi-httpservice/pom.xml jetty-osgi/jetty-osgi-npn/pom.xml jetty-osgi/pom.xml jetty-osgi/test-jetty-osgi-context/pom.xml jetty-osgi/test-jetty-osgi-webapp/pom.xml jetty-osgi/test-jetty-osgi/pom.xml jetty-plus/pom.xml jetty-proxy/pom.xml jetty-rewrite/pom.xml jetty-runner/pom.xml jetty-security/pom.xml jetty-server/pom.xml jetty-servlet/pom.xml jetty-servlets/pom.xml jetty-spdy/pom.xml jetty-spdy/spdy-client/pom.xml jetty-spdy/spdy-core/pom.xml jetty-spdy/spdy-example-webapp/pom.xml jetty-spdy/spdy-http-client-transport/pom.xml jetty-spdy/spdy-http-common/pom.xml jetty-spdy/spdy-http-server/pom.xml jetty-spdy/spdy-npn-tests/pom.xml jetty-spdy/spdy-server/pom.xml jetty-spring/pom.xml jetty-start/pom.xml jetty-util-ajax/pom.xml jetty-util/pom.xml jetty-webapp/pom.xml jetty-websocket/javax-websocket-client-impl/pom.xml jetty-websocket/javax-websocket-server-impl/pom.xml jetty-websocket/pom.xml jetty-websocket/websocket-api/pom.xml jetty-websocket/websocket-client/pom.xml jetty-websocket/websocket-common/pom.xml jetty-websocket/websocket-server/pom.xml jetty-websocket/websocket-servlet/pom.xml jetty-xml/pom.xml pom.xml tests/pom.xml tests/test-continuation/pom.xml tests/test-integration/pom.xml tests/test-loginservice/pom.xml tests/test-sessions/pom.xml tests/test-sessions/test-hash-sessions/pom.xml tests/test-sessions/test-jdbc-sessions/pom.xml tests/test-sessions/test-sessions-common/pom.xml tests/test-webapps/pom.xml tests/test-webapps/test-jaas-webapp/pom.xml tests/test-webapps/test-jetty-webapp/pom.xml tests/test-webapps/test-jndi-webapp/pom.xml tests/test-webapps/test-mock-resources/pom.xml tests/test-webapps/test-proxy-webapp/pom.xml tests/test-webapps/test-servlet-spec/pom.xml tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-04-07 12:59:15 +10:00 · 2014-04-07 12:59:15 +10:00 · 6edb854c69
parent cf430665b5 64e11bc8e8
commit 6edb854c69
7 changed files with 56 additions and 39 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1,4 +1,48 @@
-jetty-9.1.4-SNAPSHOT
+jetty-9.2.0-SNAPSHOT
+
+jetty-9.1.4.v20140401 - 01 April 2014
+ + 414206 Rewrite rules re-encode requestURI
+ + 414885 Don't expose JDT classes by default
+ + 417022 Access current HttpConnection from Request not ThreadLocal
+ + 423619 set Request timestamp on startRequest
+ + 423982 removed duplicate UrlResource toString
+ + 424107 Jetty should not finish chunked encoding on exception.
+ + 425991 added qml mime type
+ + 426897 improved ContainerLifeCycle javadoc
+ + 427185 Add org.objectweb.asm. as serverClass
+ + 427204 jetty-start / startup incorrectly requires directory in jetty.base
+ + 427368 start.sh fails quietly on command line error
+ + 428594 File upload with onMessage and InputStream fails
+ + 428595 JSR-356 / ClientContainer does not support SSL
+ + 428597 javax-websocket-client-impl and javax-websocket-server-impl jars
+   Manifests do not export packages for OSGI
+ + 428817 jetty-start / Allow for property to configure deploy manager
+   `webapps` directory
+ + 429180 Make requestlog filename parameterized
+ + 429357 JDBCSessionManager.Session.removeAttribute don't set dirty flag if
+   attribute already removed
+ + 429409 osgi] jetty.websocket.servlet must import jetty.websocket.server
+ + 429487 Runner code cleanups
+ + 429616 Use UTF-8 encoding for XML
+ + 429779 masked zero length websocket frame gives NullPointerException during
+   streaming read
+ + 430088 OnMessage*Callable decoding of streaming binary or text is not thread
+   safe
+ + 430242 added SharedBlockingCallback to support threadsafe blocking
+ + 430273 Cancel async timeout breaks volatile link to avoid race with slow
+   expire
+ + 430341 add apache jsp and jstl optional modules
+ + 430490 Added JETTY_SHELL 426738 Fixed JETTY_HOME comments
+ + 430649 test form encoding
+ + 430654 closing client connections can hang worker threads.
+ + 430808 OutputStreamContentProvider violates OutputStream contract.
+ + 430822 jetty-start / make soLingerTime configurable via property
+ + 430823 jetty-start / make NeedClientAuth (ssl) configurable via property
+ + 430824 jetty-start / use of jetty-logging.xml prevents configuration of
+   ThreadPool in jetty.xml
+ + 431103 Complete listener not called if request times out before processing
+   exchange.
+ + 431592 do not resolved forwarded-for address

 jetty-9.1.3.v20140225 - 25 February 2014
 + 373952 Ensure MongoSessionManager un/binds session attributes on refresh
--- a/jetty-fcgi/fcgi-client/pom.xml
+++ b/jetty-fcgi/fcgi-client/pom.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
        <groupId>org.eclipse.jetty.fcgi</groupId>
        <artifactId>fcgi-parent</artifactId>
--- a/jetty-fcgi/fcgi-server/pom.xml
+++ b/jetty-fcgi/fcgi-server/pom.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>org.eclipse.jetty.fcgi</groupId>
        <artifactId>fcgi-parent</artifactId>
--- a/jetty-fcgi/pom.xml
+++ b/jetty-fcgi/pom.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
        <groupId>org.eclipse.jetty</groupId>
        <artifactId>jetty-project</artifactId>
--- a/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
+++ b/jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
@ -385,7 +385,7 @@ public class ProxyServlet extends HttpServlet

        if (rewrittenURI == null)
        {
-            response.sendError(HttpServletResponse.SC_FORBIDDEN);
+            onRewriteFailed(request, response);
            return;
        }

@ -490,6 +490,11 @@ public class ProxyServlet extends HttpServlet
        proxyRequest.send(new ProxyResponseListener(request, response));
    }

+    protected void onRewriteFailed(HttpServletRequest request, HttpServletResponse response) throws IOException
+    {
+        response.sendError(HttpServletResponse.SC_FORBIDDEN);
+    }
+
    protected Request addViaHeader(Request proxyRequest)
    {
        return proxyRequest.header(HttpHeader.VIA, "http/1.1 " + getViaHost());
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHttpOutput.java
@ -115,37 +115,13 @@ public class GzipHttpOutput extends HttpOutput
    
    private void gzip(ByteBuffer content, boolean complete, final Callback callback)
    {
-        if (content.hasRemaining())
+        if (content.hasRemaining() || complete)
        {
            if (content.hasArray())
                new GzipArrayCB(content,complete,callback).iterate();
            else
                new GzipBufferCB(content,complete,callback).iterate();
        }
-        else if (complete)
-        {
-            _deflater.finish();
-
-            int produced=_deflater.deflate(_buffer.array(),_buffer.arrayOffset()+_buffer.limit(),_buffer.capacity()-_buffer.limit(),Deflater.NO_FLUSH);
-            _buffer.limit(_buffer.limit()+produced);
-            addTrailer();
-            superWrite(_buffer,complete,new Callback()
-            {
-                @Override
-                public void succeeded()
-                {
-                    getHttpChannel().getByteBufferPool().release(_buffer);
-                    _buffer=null;
-                    callback.succeeded();
-                }
-
-                @Override
-                public void failed(Throwable x)
-                {
-                    callback.failed(x);
-                }
-            });
-        }
    }

    protected void commit(ByteBuffer content, boolean complete, Callback callback)
--- a/jetty-spdy/spdy-npn-tests/pom.xml
+++ b/jetty-spdy/spdy-npn-tests/pom.xml
@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <groupId>org.eclipse.jetty.spdy</groupId>
        <artifactId>spdy-parent</artifactId>