15852 Commits

Author SHA1 Message Date
Lachlan Roberts
0f3f77761f Issue #2706 - Resource Service Incorrectly Returning 404
Replaced the response.isCommitted() check with a boolean returned from _resourceService.doGet().
This means the response does not need to be committed for the check to work correctly.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-20 11:01:56 +10:00
Lachlan Roberts
648554ad5c Issue #2706 - Resource Service Incorrectly Returning 404
Removed response.flushBuffer() after writing to fix DefaultServletTest.testFiltered()

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-19 12:46:18 +10:00
Lachlan Roberts
6de77d26e2 Issue #2706 - Resource Service Incorrectly Returning 404
Flush response buffer in places where the response needs to be committed.
Removed if statement preventing HEAD requests processing conditional headers.
Added two new test cases which failed before the changes and should now pass.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-07-18 11:27:19 +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
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
olivier lamy
127b302999 increase default timeout to prevent failure on slow machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-13 12:13:59 +10:00
Jan Bartel
80c311fb3d Issue #2656 remove forced Import-Package statements in osgi test poms 2018-06-12 18:26:59 +02:00
Lachlan Roberts
34351c7854 Issue #2398 - MultiPart Charset Encoding
Improved comment describing charset behaviour for MultiPart

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-12 17:31:04 +10:00
Olivier Lamy
71dc6d9ceb delete file if exist to prevent build failure for non clean build #2650 (#2651)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-12 09:23:39 +02:00
Sean Kavanagh
83b2abebb7 Added null check when adding credentials to Set (#2649)
Added null check when adding credentials to Set returned from getPrivateCredentials().  Fixes #2648

Signed-off-by: Sean Kavanagh <sean.p.kavanagh6@gmail.com>
2018-06-12 08:39:21 +10:00
olivier lamy
eed55854e5 #2600 increase wait time as start can be long for some machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-11 18:00:42 +10:00
Simone Bordet
4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644)
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02:00
Greg Wilkins
482e207392
Merge pull request #2636 from lachlan-roberts/jetty-9.4.x-2592-WriteFlusher-Cleanup
Issue #2592 - WriteFlusher Cleanup
2018-06-09 09:56:04 +02:00
Lachlan Roberts
da58c20d90 Issue #2592 - Rework of WriteFlusher
changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-09 10:24:43 +10:00
Joakim Erdfelt
ddceef42fd
Merge pull request #2645 from spdermn02/quick-fix/documentation
Incorrect sigil used for example of --list-config command
2018-06-08 15:05:41 -05:00
Jameson Allen
b5fea4f4f6 Incorrect sigil used for example of --list-config command
changed % to $ in the example of --list-config command

Signed-off-by: Jameson Allen <jameson.f.allen@gmail.com>
2018-06-08 14:36:50 -05:00
Simone Bordet
fbcc752ad7
Fixes #2631 - Buffering capacity exceeded for HEAD requests with large Content-Length. (#2640)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-08 17:48:58 +02:00
Simone Bordet
5165b082b5 Issue #901 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType.
Improved defaulting values for the truststore, avoiding to default
the password, which is often missing for a truststore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-08 17:40:23 +02:00
Jan Bartel
a6532f7116 Fix osgi jetty-testrealm.xml file. 2018-06-08 10:52:15 +02:00
Simone Bordet
23fa0303a6 Fixes #2632 - Wrong return type for Request.send​(Response.CompleteListener listener) method in documentation for Jetty 9.4.x.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-08 09:25:07 +02:00
Joakim Erdfelt
3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt
bf5697cc14 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-06-07 14:31:10 -05:00
Lachlan
d926f04217 Fixes #2594 - Fix failing tests in SaveOptimizeTest due to timing issues (#2608)
Tests in SaveOptimizeTest were checking if the last time the SessionData had been saved was greater than it was before
if the second save occured on the same millisecond as the first it failed the assertion
now counting how many times the SessionData has been saved instead of when it was saved

Added memory barriers to TestContextScopeListener and TestSessionDataStore as they are being accessed from multiple different threads in the test

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-06-07 14:58:35 +02:00