4502 Commits

Author SHA1 Message Date
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