Greg Wilkins
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
Lachlan
dbe340a20e
Issue #300 - Implement Deflater Pool ( #2784 )
...
Issue #300 - Implement Deflater Pool
Removed the ThreadLocal pooling of deflaters in GzipHandler in favour of a new DeflaterPool class
GzipHttpOutputInterceptor.GzipBufferCB now recycles the Deflater in onCompleteFailure()
added benchmark for the DeflaterPool
allow negative capacity to mean no limit on the pool size
added mod file and xml changes
replace setDeflaterPool with newDeflaterPool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-08-21 10:32:34 +10:00
Joakim Erdfelt
a3fe88cf1f
Removing invalid (and ignored) test from Issue #1175
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-20 14:23:17 -05:00
Jan Bartel
9fcb5ef9fb
Jetty 9.4.x 2745 jdbcsessiondatastore nvarchar ( #2783 )
...
* Issue #2745 Allow string type to be explicitly set for JDBCSessionDataStore
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-08-16 08:28:32 +10:00
Greg Wilkins
a315d5464f
Unwrap ServletException #2787 ( #2790 )
...
* Issue #2787 Unwrap ServletException
* Do not unwrap UnavailableException
* unwrap to specific targets
* fixes from review
* fixes after merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 12:51:27 +10:00
Greg Wilkins
e5f0531db0
fixes after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
Greg Wilkins
9ff37122db
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-08-15 11:58:52 +10:00
Greg Wilkins
52de1965b6
Unwrap ServletException 9.3 #2787 ( #2789 )
...
* Issus #2787 unwrap ServletException
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Do not unwrap unavailable exception
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* unwrap to specific targets
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:43:52 +10:00
Kazuhiro Sera
96218e8bc4
Fix typos detected by github.com/client9/misspell
...
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09:00
Joakim Erdfelt
9390c2df3f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-06 09:04:58 -05:00
Greg Wilkins
2cc90c2be5
Less verbose testing
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-02 16:41:06 +10:00
Greg Wilkins
cd0cf3d11f
Issue #2706 - minor cleanup
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-20 16:03:27 +02:00
Greg Wilkins
d6b7f8d71f
Merge pull request #2729 from lachlan-roberts/jetty-9.4.x-2706-ResourceService
...
Issue #2706 - Resource Service Incorrectly Returning 404
2018-07-20 15:29:09 +02:00
Lachlan Roberts
8444681880
Issue #2706 - Resource Service Incorrectly Returning 404
...
changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-20 21:30:00 +10:00
Greg Wilkins
cf3681ef56
Issue #1688 Encoded form content ( #2733 )
...
* Issue #1688 Encoded form content
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* fixes from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-20 09:30:36 +02:00
Lachlan Roberts
0f3f77761f
Issue #2706 - Resource Service Incorrectly Returning 404
...
Replaced the response.isCommitted() check with a boolean returned from _resourceService.doGet().
This means the response does not need to be committed for the check to work correctly.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-20 11:01:56 +10:00
Lachlan Roberts
648554ad5c
Issue #2706 - Resource Service Incorrectly Returning 404
...
Removed response.flushBuffer() after writing to fix DefaultServletTest.testFiltered()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-19 12:46:18 +10:00
Simone Bordet
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02:00
Simone Bordet
eceaff7bed
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-07-18 16:21:00 +02:00
Simone Bordet
37e4da24cb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-07-18 16:15:27 +02:00
Greg Wilkins
17b6eee5ac
Jetty 9.4.x 2233 ssl flush try again 2 ( #2726 )
...
Major refactor of SslConnection to address #2233 and to simplify in preparation for java-11 support.
Made the `needFillInterest` and `onIncompleteFlush` methods the primary stateful methods with state for fill and flush side that does not reproduce state already held by the SslEngine itself.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 10:11:35 +02:00
Lachlan Roberts
6de77d26e2
Issue #2706 - Resource Service Incorrectly Returning 404
...
Flush response buffer in places where the response needs to be committed.
Removed if statement preventing HEAD requests processing conditional headers.
Added two new test cases which failed before the changes and should now pass.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-18 11:27:19 +10:00
Simone Bordet
cc1071fa05
Fixes #2717 - Async requests are not considered when shutting down gracefully.
...
Now using _requestStats instead of _dispatchedStats to check for
requests completed when shutting down StatisticsHandler.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-16 10:54:43 +02:00
Joakim Erdfelt
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
Joakim Erdfelt
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
lachan-roberts
e05c11ae30
Changing default Http headerCacheSize from 512 to 4096
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
Venkata Jaswanth
9d9189d476
check for session id in path if url tracking mode is enabled ( #2668 )
...
Signed-off-by: Venkata Jaswanth U <aj.jaswanth@gmail.com>
2018-07-04 10:37:08 +02:00
Joakim Erdfelt
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
Greg Wilkins
93a8afcc6b
Fixed #2677 use decoded path for favicon.ico
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-21 11:55:16 +02:00
Greg Wilkins
4f54447585
Jetty 9.4.x 2501 accept listener ( #2511 )
...
* Issue #2501 - Accept Listener
* Issue #2501 - Include accepting connections in connection limit.
* AcceptRateLimit minimal delay
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-19 09:03:54 +02:00
Matthias Perktold
09f614b48e
Eliminated redundant invocations of HandlerCollection.getHandlers()
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-18 19:19:07 +02:00
Simone Bordet
253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. ( #2665 )
...
* Fixes #2663 - Guard Throwable.addSuppressed() calls.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-14 15:21:44 +02:00
Joakim Erdfelt
1adbceae97
Merge pull request #2652 from lachlan-roberts/jetty-9.4.x-2398-MultiPartFormInputStream-Charset-Documentation
...
Issue #2398 - MultiPart Charset Encoding
2018-06-13 16:57:28 -05:00
Greg Wilkins
346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x
...
Issue #2662 Unnecessary boxing conversions
2018-06-13 22:52:27 +02:00
Matthias Perktold
f901efc413
Issue #2662 - Unnecessary boxing conversions
...
Signed-off-by: Matthias Perktold <tias251@gmail.com>
2018-06-13 16:20:12 +02:00
Joakim Erdfelt
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/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-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/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/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/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-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/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
2018-06-12 11:11:38 -05:00
Lachlan Roberts
34351c7854
Issue #2398 - MultiPart Charset Encoding
...
Improved comment describing charset behaviour for MultiPart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-12 17:31:04 +10:00
Simone Bordet
4f1dd352d6
Issue #2468 - Remove SoLinger. ( #2644 )
...
* Issue #2468 - Remove SoLinger.
For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.
As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Joakim Erdfelt
3932b11e64
Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x
2018-06-07 14:31:24 -05:00
Joakim Erdfelt
f54629a3c4
Merge pull request #2629 from eclipse/jetty-9.2.x-issue-2135-android-direct-buffers
...
Issue #2135 - proposal for Android 8.1 with SSL and direct buffers
2018-06-06 16:27:43 -05:00
Joakim Erdfelt
2d5ef67d3f
Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
...
+ Changes from review with @sbordet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:55:28 -05:00
Joakim Erdfelt
ea116028d4
Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-06 10:44:53 -05:00
Simone Bordet
fddfa40e3d
Issue #2626 - Test failure: ShutdownMonitorTest.testStartStopSamePortDifferentKey.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-06 09:53:46 +02:00
Greg Wilkins
1f1a5cb064
Merge pull request #2610 from lachlan-roberts/jetty-9.4.x-issue-2592-ServerTimeoutTest-testAsyncWriteIdleTimeoutFires
...
Issue #2592 - fix for ServerTimeoutTest.testAsyncWriteIdleTimeoutFires [HTTP] on windows
2018-06-06 08:24:07 +02:00
Lachlan Roberts
29c9afe135
Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
...
removed HttpOutput.close(Closeable) method as IO.close(Closeable) should be used instead
added isFailed() method to WriteFlusher and used it to fix WriteFlusherTest.testFailWhileBlocking()
surrounded usage of onError() in HttpOutput.run() with try-finally so that IO.close(this) is executed if onError throws
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-06 15:35:54 +10:00
Joakim Erdfelt
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
Joakim Erdfelt
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
Joakim Erdfelt
5eefa90e05
Updating to version 9.3.25-SNAPSHOT
2018-06-05 13:13:07 -05:00
Joakim Erdfelt
84205aa28f
Updating to version 9.3.24.v20180605
2018-06-05 12:11:03 -05:00
Joakim Erdfelt
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
