15870 Commits

Author SHA1 Message Date
Greg Wilkins
6e720ec202 Merge branch 'jetty-9.4.x' into jetty-9.4.x-2695-hpack-compliance 2018-07-15 17:17:16 +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
Greg Wilkins
a9819ebb01 review fixes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-12 11:50:53 +02:00
Greg Wilkins
1e703e8368 Merge branch 'jetty-9.4.x' into jetty-9.4.x-2695-hpack-compliance 2018-07-12 11:07:36 +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
Greg Wilkins
44801d8ff3 WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 18:08:36 +00:00
Greg Wilkins
09eb303d2b WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 15:28:05 +00:00
Greg Wilkins
cb6c582333 WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 15:24:55 +00:00
Greg Wilkins
9fd80e8524 WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 15:17:39 +00:00
Greg Wilkins
10ec53319a WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 14:56:42 +00:00
Greg Wilkins
b42017b942 WIP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-07-08 14:44:38 +00: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
Joakim Erdfelt
395f4394b6
Merge pull request #2657 from eclipse/jetty-9.4.x-2656-osgipackageimportversionontests
Issue #2656 remove forced Import-Package statements in osgi test poms
2018-06-13 16:26:12 -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