Commit Graph

4198 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Lachlan Roberts 72dcfc15e5 Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP]
changed write flusher to go from pending state to failed state
reverted previous HttpOutput changes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-05 19:21:30 +10:00
Simone Bordet 9524156d8a Issue #2602 - Failing test: ServerConnectorTimeoutTest.
Removed duplicate test.
Removed lines that were testing unreliable TCP behavior.
Fixed retrieval of EndPoint in case of SSL.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 18:13:25 +02:00
Simone Bordet 946e6682b7 Merged 'origin/jetty-9.4.x' into 'jetty-9.4.x'. 2018-06-01 16:43:24 +02:00
Simone Bordet 5baabd0ba8 Fixes #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:35:23 +02:00
Simone Bordet af739ce85e Issue #2237 - Test failure: SelectChannelServerSslTest.testFullURI.
Cleanup of test classes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-01 16:34:29 +02:00
Greg Wilkins c3670d5870 Issue #2237 reduce large URI to avoid split write
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-06-01 16:30:07 +02:00
Joakim Erdfelt 53e8bc2a63 Backport of issue #2560 fixes to jetty-9.3.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 12:43:17 -05:00
Joakim Erdfelt ad4dceb1c0 Issue #2560 - Moving InvalidPath logic from PathResource to ResourceContentFactory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-31 11:31:36 -05:00
Lachlan Roberts 1bf5128e6d Fixes #2592 - changes to fix ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] on windows
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-31 19:44:51 +10:00
Greg Wilkins 2bcc528920 expand spruious tabs in java sources
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
Lachlan Roberts d13e79a284 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-server-stackTraceRemoval 2018-05-26 00:35:02 +10:00
Greg Wilkins e6e49bdc85 Updated javadoc for callbacks
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-25 08:01:31 +02:00
Lachlan Roberts c829ee3210 Issue #2424 - ReadPendingException in testHttpWriteIdleTimeout()
Replacing setBlockingTimeout with setIdleTimeout to fix the ReadPendingException on ServerConnectorTimeoutTest.testHttpWriteIdleTimeout().

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:41:20 +10:00
Lachlan Roberts 0664893022 Issue #2542 - Log exception stackTraces instead of printing
replaces some usages of printStackTrace with logging in ConnectorTimeoutTest to avoid printing out the stack trace on passing tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-05-23 07:39:23 +10:00
Simone Bordet 462679910f Fixes #2544 - Test Failure: LowResourcesMonitorTest.testMaxLowResourceTime().
Rewrote the test to not write to the server,
thus avoiding connection resets.

The rewrite also clarified what the test was testing.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-22 12:55:03 +02:00
Simone Bordet 6b7f4c91db
Merge pull request #2552 from eclipse/jetty-9.4.x-2549-ConsumeAll
Issue #2549 ConsumeAll forced EOF or EarlyEOF
2018-05-18 09:18:57 +02:00
Greg Wilkins c69ab6bd56 Issue #2549 ConsumeAll forced EOF or EarlyEOF
Cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-18 16:39:44 +10:00
Greg Wilkins 252ab9facf
Jetty 9.4.x 2550 coalesce ranges (#2551)
Issue #2550 coalesce ranges

Author: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-18 08:45:54 +10:00
Greg Wilkins b93cc5abb6 Issue #2549 ConsumeAll forced EOF or EarlyEOF
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 13:05:13 +10:00
Greg Wilkins aa97518d0b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-05-17 08:27:45 +10:00
Greg Wilkins be8ff431a4 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 08:16:39 +10:00
Greg Wilkins a285deea42 Issue #2529 RFC2616 vs RFC7230 cleanup
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-17 08:00:53 +10:00
Simone Bordet 01f7aecc4e Fixes #2546 - Incorrect parsing of PROXY protocol v2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-16 21:33:22 +02:00
Greg Wilkins 4cc8f4dcf6 Issue #2346 Revert stack logging
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-16 17:21:06 +10:00
Greg Wilkins 820b5752d7 Issue #2525 fixed jetty.xml
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-16 14:32:41 +10:00
Greg Wilkins 10eaa6e261 javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-14 21:33:41 +10:00
Simone Bordet 317a8a5c66 Issue #2525 - Clean up SharedBlockingCallback.
Small cleanups and added test for thread interruption.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-05-14 10:27:34 +02:00
Greg Wilkins 625d1f7726 Issue #2525 Clean up SharedBlockingCallback
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-13 23:11:38 +10:00
Steve Bolton 7e0afae70b Issue #1785 Fix Javadoc and vhost warn logic
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-05-04 02:01:04 -04:00
Greg Wilkins 03d96ae538 Issue #1785 minor cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-04 10:20:15 +10:00
Steve Bolton ad21d35d51 Issue #1785 Pre-process vhost entries and provide warning
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-05-03 16:48:18 -04:00
Steve Bolton c73352b1f0 Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into jetty-9.4.x 2018-05-03 12:52:50 -04:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Jan Bartel 5515e13649
Issue #2427 Stop and start session idle timer (#2466)
* Issue #2427 Stop and start session idle timer

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-05-03 08:05:26 +10:00
Jan Bartel 394c6313b3 Issue #2495 Make FileSessionDataStore private methods protected 2018-05-01 09:26:51 +10:00
Simone Bordet d25fa7d20c Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-27 10:12:19 +02:00
BenBE f7faf392b2 Fix operator priority in ProxyConnectionFactory
Due to shift operations taking less precedence over addition the expression was parsed in an unintended way.

With this change the intention is made more clear and the intended order of calculations (shift the single byte values into some variable) is actually implemented.

Signed-off-by: Benny Baumann <BenBE@geshi.org>
2018-04-26 16:15:35 +02:00
Joakim Erdfelt 877f0a112a Fixing javadoc and deprecations from merge 2018-04-20 11:51:00 -05:00
Joakim Erdfelt 8763c6065d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-04-20 11:32:46 -05:00
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437)
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
Simone Bordet 7629a8f98f
Fixes #2425 - Review BufferUtil.isMappedBuffer(). (#2432)
Now explicitly using a _mappedBuffer field in
CachedContentFactory.CachedHttpContent.
Deprecated BufferUtil.isMappedBuffer().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-12 10:36:57 +02:00
Simone Bordet b09760ca9a Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-11 15:05:58 +02:00
Steve Bolton 6abf026440 Issue #1785 If only connector in vhost and not connector in request then fail to match
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 17:25:40 -04:00
Steve Bolton c79b0f4e2a Issue #1785 Update Javadoc
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 14:51:28 -04:00
Steve Bolton a30ed56ac1 Issue #1785 Added vhost@connectorname format for AND behaviour
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 13:56:45 -04:00
Lachlan Roberts 92f44389b9 fixed value of public static String __MULTIPARTS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 12:00:11 +10:00
Lachlan Roberts 4a0e4294b9 fixed path of MultiPartFormDataCompliance in jetty.xml
added some debug info
changes to jetty test webapp to display parts from multi-part forms

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 11:18:57 +10:00
Greg Wilkins 9397ae2d77 revert ResourceHandlerTest changes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-04-04 09:10:57 +10:00
Lachlan Roberts 81ff77108c Moved the MultiParts interface and implementations from Request into new file MultiParts.java
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 23:55:08 +10:00
Lachlan Roberts 1eec234336 Minor changes after review by gregw.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 21:22:16 +10:00
Lachlan Roberts b3d5333d42 Implemented switch between LEGACY and RFC7578 modes. Added tests to check this worked correctly.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 16:13:19 +10:00
Lachlan Roberts 95cd6e0614 Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:33:56 +10:00
Lachlan Roberts 13b15e3566 Resolved Charset Issues and Reworked Request.MultiPartInputStream
Changed Request.MultiPartInputStream to an interface called MultiParts where there is an implementation for both the HTTP and UTIL parsers.

Resolved some issues with default charsets in regards to request.setCharacterEncoding and the _charset_ part for issue #2398.

Changed HTTP parser to operate the same as UTIL parser in situtions with parts not of type form-data or without name field. HTTP parser was ignoring these parts, UTIL parser was throwing exceptions.

Replaced the context attribute with a field in MultiParts.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:24:54 +10:00
Greg Wilkins 48edc7305b Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-04-03 14:12:19 +10:00
Lachlan Roberts be2d6ebb29 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-04-03 12:36:54 +10:00