Commit Graph

14372 Commits

Author SHA1 Message Date
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 0f98e607e8 Issue #1514 - fixing bad websocket dump output 2017-05-31 13:36:27 -07:00
Joakim Erdfelt 8ca70c691c Issue #1569 - relaxing WebSocketPolicy.setMax*MessageSize checks
+ Allow setting of the max (binary|text) message size to -1 to
  have unconstrained message sizes.
+ Disconnect message size from buffer size in JSR356 Session calls
2017-05-31 13:06:36 -07:00
Joakim Erdfelt 8d21193931 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-31 06:11:57 -07:00
Joakim Erdfelt 08082f7509 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-05-31 06:11:34 -07:00
Joakim Erdfelt 2b93c4ecd9 Fixing PathResource.toString() duplicate 2017-05-30 13:31:09 -07:00
Joakim Erdfelt 6c89cebcbf Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2017-05-30 13:25:26 -07:00
Joakim Erdfelt b318f1c6dd Merge + Fixing formatting 2017-05-30 13:14:49 -07:00
Joakim Erdfelt d42ff37e57 Fixing compile error 2017-05-30 13:13:28 -07:00
Greg Wilkins ce67192399 Fixed determining mime type of `PathResource` based on its file name. (#1532) 2017-05-30 22:13:25 +02:00
Bernhard Haumacher 5e63c4db62 Fixed determining mime type of `PathResource` based on its file name. (#1532)
The result of `toString()` is expected to be the path name of a Resource. This is used for determining the mime type based on the file name extension in `org.eclipse.jetty.server.ResourceCache.Content`. Without a custom `toString()` implementation, no mime type can be determined for a resource. This problem does no longer exist in current Jetty, since `PathResource` has vanished.
2017-05-30 21:51:31 +02:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570)
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
Joakim Erdfelt 355f4ed7f3 Removing redundant new URI 2017-05-30 12:16:10 -07:00
Joakim Erdfelt ae496051de Fixing confusing wss -> https case 2017-05-30 12:15:01 -07:00
WalkerWatch c9c284f432 Sessions doco update 2017-05-30 10:14:27 -04:00
Greg Wilkins 98970f973c Fixed #1579 forgiving of bad quality CSV 2017-05-30 10:19:14 +02:00
Greg Wilkins cb84946467 Fixed #1579 forgiving of bad quality CSV 2017-05-30 10:14:12 +02:00
Greg Wilkins 50500ac99d Issue #1568 handle query strings with encoded characters 2017-05-24 23:03:22 +02:00
Greg Wilkins 78280d0595 Issue #1568 handle query strings with encoded characters 2017-05-24 09:22:16 +02:00
Joakim Erdfelt 4731470188 Issue #1568 - fixing accidental NPE with no query 2017-05-23 11:59:39 -07:00
Joakim Erdfelt 296050dfc4 Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest 2017-05-23 10:32:22 -07:00
Jan Bartel 79883c739d Merge pull request #1545 from olamy/bugfix/1520
PropertyUserStore should extract packed config file #1520
2017-05-23 11:51:48 +02:00
Greg Wilkins 971044fe31 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-22 23:35:04 +02:00
Greg Wilkins 0d316345ad StopLifeCycle utility class 2017-05-22 23:34:24 +02:00
Greg Wilkins 33e2f89ccb Fix #1567 2017-05-22 21:13:00 +02:00
Joakim Erdfelt b32f652d7c Issue #1536 adding missing artifacts 2017-05-22 10:33:01 -07:00
WalkerWatch b5ab099ac7 Fixing typo 2017-05-22 13:12:21 -04:00
WalkerWatch 08b96c3765 Correcting and cleaning up quickstart documentation. Resolves #1565 2017-05-22 13:02:17 -04:00
WalkerWatch 8eb3b997de Removed deprecated [name] section 2017-05-22 12:18:48 -04:00
Joakim Erdfelt e3bab3df22 Issue #1528 - Use WebSocketContainer out of current context
+ Interrogate ServletContext, ContextHandler, and Context
  for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
Joakim Erdfelt e001fe0355 Issue #1528 - pull preconfigured HttpClient from attributes
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
Joakim Erdfelt 7b2a0e380d Using ThreadClassLoaderScope 2017-05-18 16:13:16 -07:00
Joakim Erdfelt 59c86307cb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-18 16:05:57 -07:00
Joakim Erdfelt d706a826bc Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-05-18 16:00:29 -07:00
Joakim Erdfelt 7f497e8720 Issue #1527 - jetty-bom, breaking the build again 2017-05-18 15:48:01 -07:00
Joakim Erdfelt 9c3e5c2150 Removing tag, not relevant 2017-05-18 15:47:52 -07:00
Joakim Erdfelt 75101dfa0c Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
+ Will use XML resource (if jetty-xml is present, and resource found)
  to load the HttpClient configuration that should be used by the
  new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
Joakim Erdfelt 9b4bfbc680 Issue #1544 - Identifying context that JSR-356 was disabled for in configuration 2017-05-18 14:03:16 -07:00
Joakim Erdfelt 237d925dd0 Merge pull request #1541 from olamy/bugfix/1527_jetty-9.4.x
fix for #1527 9.4.x branch
2017-05-18 14:00:08 -07:00
Joakim Erdfelt 30f3ece681 Merge pull request #1540 from olamy/bugfix/1527_jetty-9.3.x
fix for #1527 9.3.x branch
2017-05-18 14:00:02 -07:00
Simone Bordet c09a78adae Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-18 21:12:29 +02:00
Simone Bordet 9427aa95e8 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-18 21:09:54 +02:00
Simone Bordet 2baa1abe4b Issue #1556 - A timing channel in Password.java.
Improved logic to avoid timing attacks:
now the password length cannot be inferred.
2017-05-18 21:09:16 +02:00
WalkerWatch 82c909acdc Documentation updates 2017-05-18 12:12:32 -04:00
olivier lamy 7d600b0c54 #1520 reuse code from JarResource to extract packed file
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-18 16:04:41 +10:00
Greg Wilkins 971bdac6b0 Issue #1546 Ignore $names in Cookies in RFC6265 compliance mode 2017-05-18 07:47:33 +02:00
Simone Bordet 14c132805e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-17 15:32:48 +02:00
Simone Bordet b2481d472b Issue #523 - TLS close behaviour breaking session resumption.
Removed old test, duplicated by newer and better tests.
2017-05-17 15:32:18 +02:00
Simone Bordet 1ac103b6ce Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-17 13:16:21 +02:00
Simone Bordet d53af5d737 Fixes #523 - TLS close behaviour breaking session resumption.
Since requests cannot be connection delimited, don't call
sslEngine.closeInbound() on the server.

On the client, added a configuration parameter to allow missing
TLS Close Message, since many servers do that.

Introduced SslConnection.allowMissingCloseMessage so that it
throws in case of truncation attacks.
2017-05-17 13:07:21 +02:00