Commit Graph

16489 Commits

Author SHA1 Message Date
Joakim Erdfelt c68cb3149f
Merge pull request #3315 from eclipse/jetty-9.4.x-issue-3279-websocket-flush-hang
Issue #3279 - WebSocket May Hang Forever
2019-02-15 10:08:01 -05:00
Joakim Erdfelt 8dba440317 Issue #3279 - WebSocket Close Refactoring
+ FrameFlusher "close" frames are detected during
  enqueue and sets the state properly for failing
  other frames after it
+ Moving away from Blockhead(Client|Server) to using actual implementations
+ Moved tests to /jetty-websocket-tests/ to be able to use actual impl
  for both sides of testcase (client and server)
+ Corrected FrameFlusher terminate/close to not fail the close frame
  itself, but only frames that arrive AFTER the close frame.
+ Moving WebSocketCloseTest to jetty-websocket-tests to avoid
  using BlockheadClient / BlockheadServer in testing
+ Cleanup of unnecessary modifiers on interface
+ Logging error if @OnWebSocketError is undeclared
+ IOState removed
+ New ConnectionState tracks connection basics in a simpler
  method then IOState did.
+ No tracking of Remote close initiated (not needed)
+ IncomingFrames.incomingError() removed
+ Session delegates to Connection for all state changes
+ Errors can be communicated to application multiple times
+ Close is only communicated once

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-15 10:07:24 -05:00
Joakim Erdfelt f88f856673
Merge pull request #3326 from eclipse/jetty-9.4.x-3278-empty-resourcecollection
Issue #3278 Empty ResourceCollection throws NPE
2019-02-14 10:22:48 -05:00
Joakim Erdfelt 8969c9a18c Issue #3278 - more cleanup based on review of older codebase with simone 2019-02-14 08:02:24 -05:00
Joakim Erdfelt a105c44856 Issue #3278 - code reformatting 2019-02-14 07:48:05 -05:00
Joakim Erdfelt 432ed1f584 Issue #3278 - changes from review with simone 2019-02-14 07:43:17 -05:00
Joakim Erdfelt 1150f20ed9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:17:42 -05:00
Joakim Erdfelt a6c626a891 Fixing Javadoc 2019-02-13 17:17:11 -05:00
Joakim Erdfelt 7ee7554b8f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3278-empty-resourcecollection 2019-02-13 17:09:38 -05:00
Simone Bordet e84feb22b3
Merge pull request #3356 from eclipse/jetty-9.4.x-3350-httpclient_default_sslcontextfactory
Issue #3350 - Do not expect to be able to connect to https URLs with …
2019-02-13 15:16:24 +01:00
Simone Bordet ec3adb0c11 Issue #3350 - Do not expect to be able to connect to https URLs with the HttpClient created from a parameterless constructor.
This is a regression introduced by fixing #2817.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:37:05 +01:00
Simone Bordet 009a4659a7 Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Made sure web apps are unpacked in a directory
within $jetty.base to avoid cluttering /tmp.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 19:21:43 +01:00
Simone Bordet 6aa917080f Issue #3347 - Fix race condition between onFillable() and resume().
Renamed Suspender -> ReadState.
Reworked the implementation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 16:15:07 +01:00
Simone Bordet a16d98ffd7
Merge pull request #3347 from shawnsmith/jetty-9.4.x-websocket-suspend-resume
Fix race condition between onFillable() and resume()
2019-02-12 15:08:43 +01:00
Simone Bordet 94829751a3
Merge pull request #3344 from eclipse/jetty-9.4.x_distribution_it_tests
Issue #3343 Add an API/tools to be able to test Jetty Distribution
2019-02-12 11:10:34 +01:00
Simone Bordet b2e6fae511
Merge pull request #3346 from RichardBradley/vary-origin
Include Vary:Origin on all responses from CrossOriginFilter
2019-02-12 09:31:18 +01:00
olivier lamy 265cc79225 jetty-distribution is test scope
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 18:22:39 +10:00
Simone Bordet 2d88b3b959 Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
olivier lamy a1a02d9942 fix CI test, distribution must be build first as we want to use a fresh build of the distro
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-12 12:25:57 +10:00
Shawn Smith e16e836aa6 Fix race condition between onFillable() and resume()
Signed-off-by: Shawn Smith <shawn@thena.net>
2019-02-11 18:08:53 -06:00
Simone Bordet 9c59db6fdd Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Updated maven.version to 3.6.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:41:29 +01:00
Simone Bordet 3c665dfc1c Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Added missing license header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:36:14 +01:00
Simone Bordet b0207dd90d Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
Reworked the implementation.
Deleted unused stuff.
Written more tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 19:37:49 +01:00
Richard Bradley cb6b9d4a39 Include Vary:Origin on all responses
Signed-off-by: Richard Bradley <Richard.Bradley@softwire.com>
2019-02-11 14:07:41 +00:00
olivier lamy cbc9a9cff3 apply some comments from review
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 21:34:52 +10:00
olivier lamy 214bc03270 DistributionTester is definitely a better name
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy dd4041dae1 cleanup not used variable
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 85fd1db963 add jpms test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy d9bfece0cc rename class, add more javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 6a42d3ba08 Issue #3343 add api/tools to test jetty distribution
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
olivier lamy 972dc015bb sugar syntax changes
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 20:07:48 +10:00
Simone Bordet 875af5c692 Restored Automatic-Module-Name that was removed in 471dab752.
Cleaned up pom.xml files that required a correct JPMS module name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
olivier lamy 9c655cbd29 do not record unit test failure twice with jdk11
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-11 17:46:00 +10:00
Simone Bordet d575091c08 Fixes #3178 - BufferingResponseListener does not clear buffer in onHeaders.
Updated javadocs to specify that the class is not reusable.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-08 13:35:40 +01:00
Simone Bordet c9f73878c9
Merge pull request #3327 from eclipse/jetty-9.4.x-3154-hostname_verifier
Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient
2019-02-07 10:42:27 +01:00
Jan Bartel 9a25f2757e
Issue #3307 WebAppClassLoader.loadClass call resolveClass if resolve==true (#3328)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-07 09:22:42 +11:00
Simone Bordet 47871fb41e Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient.
Added javadocs after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-06 22:31:28 +01:00
Joakim Erdfelt 12628adc10 Issue #3278 - ResourceCollection NPE
+ Adding tests + more NPE / ISE / IAE fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-06 11:46:34 -06:00
Tushar I cd304eb65b Issue #150: Ability to handle JAR directories in extraClasspath. (#3325)
* Issue #150: Ability to handle JAR directories in extraClasspath. In keeping with Java conventions[0], any directory paths ending in /* should be considered a JAR directory and all jars in that directory will be added (non recursively) to the classpath.

[0] https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html

Signed-off-by: Tushar Inamdar <tusharinamdar@hotmail.com>
2019-02-06 17:56:54 +11:00
Jan Bartel adc2d43536
Issue #3329 Hazelcast remove session fails (#3330)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-06 17:18:40 +11:00
Simone Bordet 8964608bfc Fixes #3154 - Add support for javax.net.ssl.HostnameVerifier to HttpClient.
Added a SslHandshakeListener to SslConnection that performs
the host name verification (only on the client) if the
HostnameVerifier has been configured in SslContextFactory.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-05 15:48:17 +01:00
Jan Bartel ebef147d93 Issue #3278 Empty ResourceCollection throws NPE
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-02-05 16:14:18 +11:00
Simone Bordet d22ec03acc
Merge pull request #3287 from eclipse/jetty-9.4.x-3049-sslcontextfactory_warnings
Issue #3049 - Warn on common SslContextFactory problematic configurations
2019-02-04 22:56:32 +01:00
Simone Bordet 6c0eee7012
Merge pull request #3322 from eclipse/jetty-9.4.x-3210-unmanaged_threadpool
Fixes #3210 - Threadpool module creates unmanged threadpool.
2019-02-04 22:52:30 +01:00
Greg Wilkins 0809228549 Issue #3317 avoid double log of exception
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:28:37 +11:00
Greg Wilkins 051edc94d7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-02-05 08:21:38 +11:00
Simone Bordet 6a64031840 Fixes #3210 - Threadpool module creates unmanged threadpool.
The thread pool is now created as a nested object, rather than a top
level object, so that it is not started before the Server instance.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 19:40:29 +01:00
Simone Bordet fda815cd56
Merge pull request #3306 from eclipse/jetty-9.4.x-3305-avoid_select_now
Fixes #3305 - Avoid additional selectNow().
2019-02-04 11:44:13 +01:00
Simone Bordet bf6521da5f
Merge pull request #3312 from eclipse/jetty-9.4.x-3311-http_https_same_port
Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
2019-02-04 09:17:35 +01:00
Simone Bordet da490673af Fixes #3311 - Ability to serve HTTP and HTTPS from the same port.
Updated implementation and tests after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-03 14:24:07 +01:00