Commit Graph

15878 Commits

Author SHA1 Message Date
Simone Bordet 06303492f9 There already exist JDK 12 early access builds.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 17:43:49 +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
Simone Bordet 7845497702 Updated ALPN version for JDK 8u181.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 15:47:39 +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
Simone Bordet 9eca404da2
Fixes #2722 - Improve configurability for SETTINGS frames. (#2723)
* Fixes #2722 - Improve configurability for SETTINGS frames.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 10:07:14 +02:00
Greg Wilkins 3d5b769706
Merge pull request #2700 from lachlan-roberts/jetty-9.4.x-2685-QuotedQualityCSV
Issue #2685 - bad content in QuotedQualityCSV results in empty entries
2018-07-17 17:42:12 +02:00
Simone Bordet 980282ef9b
Fixes #2672 - Max local stream count exceeded for Http2 Client (#2693)
* Fixes #2672 - Max local stream count exceeded for HttpClient with HTTP/2 transport.

Now waiting for the server preface to arrive to the client before making
the connection available to the ConnectionPool.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-16 17:13:47 +02:00
Simone Bordet 9fc7e909f6
Merge pull request #2721 from eclipse/jetty-9.4.x-2717-stats_handler_shutdown
Fixes #2717 - Async requests are not considered when shutting down gracefully.
2018-07-16 17:08:32 +02: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 9c15796403
Merge pull request #2713 from cdelg/jetty-9.4.x-2694-dynamic_imports
Fixes #2694 - Dynamic imports of Websocket servlet
2018-07-12 05:30:21 -05:00
Clément Delgrange 51769fc645 Fixes #2694 - Dynamic imports of Websocket servlet
Fixes the dynamic imports of `org.eclipse.jetty.websocket.server` and `org.eclipse.jetty.websocket.server.pathmap` as explained in the issue #2694 proposition 2. (previously the content of `org.eclipse.jetty.websocket.server` was not imported)

Signed-off-by: Clément Delgrange <cl.delgrange@protonmail.com>
2018-07-12 11:55:59 +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
Simone Bordet b46b8e7348
Merge pull request #2705 from eclipse/jetty-9.4.x-2530-wakeup_selector_after_close
Fixes #2530 - Client waits forever for cancelled uploads.
2018-07-11 12:02:27 +02:00
Greg Wilkins 842e3c850a
Merge pull request #2707 from lachlan-roberts/jetty-9.4.x-HttpParser-headerCacheSize
Changing default Http headerCacheSize from 512 to 4096
2018-07-11 08:46:54 +01:00
Simone Bordet a557a84447 Fixes #2530 - Client waits forever for cancelled uploads.
Reworked implementation after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-10 11:34:56 +02: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
Simone Bordet 6553957278 Fixes #2530 - Client waits forever for cancelled uploads.
Added comment after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-09 17:26:05 +02:00
Simone Bordet 0c8b33e581 Fixes #2530 - Client waits forever for cancelled uploads.
After discussion on openjdk/nio-dev, we now wakeup the selector
after closing a socket, so that the SelectionKey can be removed
from the Selector and the TCP stack notified that the socket
has been really closed, so that it can send RST to clients.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-09 10:02:45 +02:00
Simone Bordet e03d16e59e
Merge pull request #2704 from lachlan-roberts/jetty-9.4.x-HttpParser-DuplicateCachePut
Removing unnecessary CACHE.put calls in HttpParser
2018-07-09 09:38:38 +02:00
lachan-roberts 1a4d304a0b Removed unnecessary CACHE.put calls in HttpParser
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-09 11:33:05 +10:00
lachan-roberts 8fd5e8563e Issue #2685 - bad content in QuotedQualityCSV results in empty entries
changes from review

Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-09 10:52:49 +10:00
Lachlan Roberts bb1b36b4c6 Issue #2685 - bad content in QuotedQualityCSV results in empty entries
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-06 14:41:15 +10:00
Jan Bartel c45ca9e38b Issue #2696 Fix syntax of excludedGroupIds for dependency plugin 2018-07-05 15:14:42 +02:00
Jan Bartel f6380feef5
Issue #2696 Fix generation of gcloud deps (#2697)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-07-05 14:25:59 +02:00
Simone Bordet 635cf4d374 Issue #2349 - Review HTTP/2 max streams enforcement.
Restored code that was deleted by mistake.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-04 11:12:34 +02: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
WalkerWatch 42e939000d CVE Report Fix 2018-07-03 11:35:05 -04:00
WalkerWatch 13a070db70 Doc merge 2018-07-03 11:33:42 -04:00
WalkerWatch f41a766ea5 Updating CVE table 2018-07-03 11:18:55 -04:00
Joakim Erdfelt e45009d96a
Merge pull request #2686 from cakofony/conscrypt
Fixes #2342 Upgrade Conscrypt to 1.1.4
2018-06-29 09:09:40 -05:00
Carter Kozak cd60da7a12 fix #2342 Upgrade Conscrypt to 1.1.4
Fixes https://github.com/google/conscrypt/issues/491

Signed-off-by: Carter Kozak <c4kofony@gmail.com>
2018-06-29 08:41:34 -04:00
Joakim Erdfelt 0a7ad593e4 Issue #2684 - assumed MimeTypes can now be accessed/changed.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-27 09:52:01 -05:00
Joakim Erdfelt 33c497a883 Issue #2683 - FrameFlusher.toString() isn't thread safe
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-27 07:06:38 -05:00
Joakim Erdfelt 6b335877d9
Merge pull request #2658 from eclipse/jetty-9.4.x-issue-2655-wsclient-session-removal
Issue #2655 - Removing closed WebSocket Session's from WebSocketClient
2018-06-22 10:15:48 -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
Joakim Erdfelt 2e5f106285 Issue #2655 - Applying changes requested from review.
+ WebSocketClient all constructors now delegate down into one
  implementation
+ NativeWebSocketServletConfiguration is now managed properly
+ WebSocketServletFactory can find Executor as bean too

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-20 12:59:23 -05:00
Joakim Erdfelt ada36ec4a9 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-06-19 10:53:39 -05:00
Joakim Erdfelt 0ecc5fb3ae Issue #2675 - adding testcase to demonstrate issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-19 10:53:11 -05: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
Greg Wilkins 92ba1375be
Merge pull request #2641 from eclipse/jetty-9.4.x-901-load_truststore
Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
2018-06-19 09:01:17 +02:00
Greg Wilkins 5e1db95282
Merge pull request #2674 from mperktold/jetty-9.4.x
Eliminated redundant invocations of HandlerCollection.getHandlers()
2018-06-19 08:58:28 +02:00
Olivier Lamy 9e8743788d
no need of jacoco for other jdk btw jenkins ui do not display jdk label.. (#2673)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-19 09:24:02 +10: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
Olivier Lamy f7df6b3326
increase default build memory (#2669)
increase default build memory
2018-06-15 17:13:05 +10: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 f9b5949541 Bumping up max MAVEN memory to 2GB
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-14 08:11:54 -05: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
Joakim Erdfelt 870c87f2f7 Issue #2655 - Removing closed WebSocket Session's from WebSocketClient
+ Correcting Native WebSocketConfiguration impact.
+ CDI requires a customized DecoratedObjectFactory, which is bound
  later in the lifecycle, which means we cannot rely on it being
  provided directly in the constructors, but rather have to look
  for it in the ServletContext.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-13 16:53:14 -05:00