Simone Bordet
823e713ee4
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-08-22 17:35:25 +02:00
Simone Bordet
2d3f0e0c10
Improved logging and toString() implementations,
...
small refactorings in code and tests.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-22 17:31:12 +02:00
Joakim Erdfelt
47229e0190
Addressing checkstyle error
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-20 13:31:17 -05:00
Joakim Erdfelt
5a0f18513b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4572-message-indent
2020-08-20 13:29:50 -05:00
Simone Bordet
ac4ea4550e
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-08-13 16:52:35 +02:00
Joakim Erdfelt
e7a07074f5
Setting DemoBaseTest.testAsyncRest() as @Tag("external")
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-13 08:42:44 -05:00
Joakim Erdfelt
00f4859e33
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-12 16:04:06 -05:00
Joakim Erdfelt
9b5b43a2fd
Fixing KeyStoreScannerTest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-12 15:50:11 -05:00
olivier lamy
f2d9d2f46f
increase stop timeout
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-12 15:01:39 +08:00
olivier lamy
495a1cb109
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-08-12 09:49:06 +08:00
Olivier Lamy
12667497e1
Jetty 9.4.x surefire 3.0.0 m5 ( #5136 )
...
* test surefire 3.0.0-M5
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* simplify code to avoid some timeout
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-12 10:27:12 +10:00
Simone Bordet
16cd552995
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-08-11 21:00:43 +02:00
olivier lamy
c198d26e6b
Updating to version 10.0.0-SNAPSHOT
2020-08-11 16:47:55 +08:00
olivier lamy
429b091578
Updating to version 10.0.0.beta1
2020-08-11 16:47:54 +08:00
Simone Bordet
d53d9d8a1d
Fixes #5079 - :authority header for IPv6 address not having square brackets.
...
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.
On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.
Added a number of test cases, and fixed those that expected
non-bracketed IPv6.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-07 15:53:19 +02:00
Simone Bordet
c49035570e
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'.
2020-08-04 16:32:55 +02:00
Simone Bordet
55f51fa0b5
Fixed copyright headers.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-31 19:01:59 +02:00
Simone Bordet
2fe01626a5
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-31 17:47:37 +02:00
Greg Wilkins
7adbf247ec
Issue #5093 Static UrlEncoded ( #5098 )
...
* Issue #5093 Static UrlEncoded
Updated UrlEncoded to static only class with no synchronization
* Fixed additional tests
* fixed formatting
Signed-off-by: gregw <gregw@webtide.com>
2020-07-30 17:57:38 +02:00
Simone Bordet
089e51f0bc
Fixes #5083 - Convert synchronized usages to AutoLock.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-29 15:34:01 +02:00
Simone Bordet
8d69fc41a7
Fixes #5083 - Convert synchronized usages to AutoLock.
...
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Joakim Erdfelt
fe9deae849
Updating to version 9.4.32-SNAPSHOT
2020-07-23 13:53:47 -05:00
Joakim Erdfelt
450ba27947
Updating to version 9.4.31.v20200723
2020-07-23 12:46:54 -05:00
Lachlan Roberts
9f3864af7e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-23 18:08:20 +10:00
Lachlan
6b37983c89
Merge pull request #5065 from eclipse/jetty-9.4.x-5062-testKeystoreRemoval
...
Issue #5062 - fix flaky test KeyStoreScannerTest.testKeystoreRemoval()
2020-07-23 17:28:52 +10:00
Lachlan Roberts
d5cf429537
fix websocket tests from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 12:17:20 +10:00
Lachlan Roberts
5726fa9364
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-23 10:19:53 +10:00
Joakim Erdfelt
1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-21 16:04:27 -05:00
Lachlan Roberts
38a94879f9
Issue #5062 - KeyStoreScannerTest should use manual scanning to avoid timing issues
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-21 11:31:40 +10:00
Joakim Erdfelt
f87711b2da
Adding jmh test to compare String.substring() vs String.repeat()
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-16 13:30:47 -05:00
Joakim Erdfelt
2d3b5d3f05
Moving badly merged jetty-jmh source files into correct location
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-16 13:20:43 -05:00
Lachlan Roberts
ef60808bae
fix licence headers and imports from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 09:27:46 +10:00
Lachlan Roberts
f0f153cc97
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-16 09:10:07 +10:00
Lachlan Roberts
a83844df32
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:10:07 +10:00
Lachlan Roberts
b03643961d
add tests in KeystoreScannerTest for changes with symlinks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 00:22:21 +10:00
Lachlan Roberts
62ee077b79
move code of ssl-reload module to jetty-util, move module files to jetty-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 23:11:09 +10:00
olivier lamy
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
olivier lamy
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
olivier lamy
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
olivier lamy
4cd6a71134
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-07-09 07:54:59 +10:00
olivier lamy
7bcbc21ca9
no need of system property for this
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 07:52:47 +10:00
Simone Bordet
7d8e56bd10
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-03 16:46:23 +02:00
Simone Bordet
ae43b70a9f
Jetty 9.4.x 4967 buffer corruption for http2 failures ( #5001 )
...
Fixes #4967 - Possible buffer corruption in HTTP/2 session failures
Partially reverted the changes introduced in #4855 , because they
were working only when sends were synchronous.
Introduced ByteBufferPool.remove(ByteBuffer) to fix the issue.
Now when a concurrent failure happens while frames are being
generated or sent, the buffer is discarded instead of being
recycled, therefore resolving the buffer corruption.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-03 16:35:33 +02:00
Lachlan Roberts
b033d6078f
Issue #5012 - Remove unneeded dependency for test-jaas-webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-03 09:54:18 +02:00
Lachlan Roberts
6407322d9c
Issue #5012 - Remove unneeded dependency for test-jaas-webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-02 11:15:34 +10:00
Joakim Erdfelt
02bd1e5956
Followup changes from merge
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 12:52:49 -05:00
Joakim Erdfelt
e1c8a0e8b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-06-25 12:52:29 -05:00
Joakim Erdfelt
3adec35cf5
Fixing CustomImportOrder checkstyle violations
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 09:25:05 -05:00
Simone Bordet
0b854a1f5f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-06-18 15:37:09 +02:00