Commit Graph

15371 Commits

Author SHA1 Message Date
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 94c9fc548c Merged branch 'jetty-9.4.x' into 'master'. 2017-05-18 21:12:50 +02: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 3700c38714 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-17 15:33:01 +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 311b9fbab0 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-17 13:16:45 +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
Jan Bartel 4eca47cdf4 Issue #1558 2017-05-17 11:21:18 +02:00
Simone Bordet 5adeee1d2b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-17 10:11:57 +02:00
Simone Bordet da05582b9a Marking the parser at EOF in case of exceptions. 2017-05-17 10:11:10 +02:00
olivier lamy 8b94f2f275 correctly close ZipInputstream #1520
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-17 10:55:11 +10:00
Simone Bordet 2b7bdf93e7 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-16 16:35:53 +02:00
Simone Bordet 20e7f4881f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-16 16:35:33 +02:00
Simone Bordet 1e2093c14a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-16 16:34:39 +02:00
Simone Bordet f3751d7078 Issue #1556 - A timing channel in Password.java.
Fixed comparison logic, doh.
2017-05-16 16:34:04 +02:00
Simone Bordet bc2f3193ab Merged branch 'jetty-9.4.x' into 'master'. 2017-05-16 11:37:01 +02:00
Simone Bordet bd2f3db69f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-05-16 11:35:01 +02:00
Simone Bordet 1ef845556b Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-05-16 10:44:46 +02:00
Simone Bordet 042f325f1c Fixes #1556 - A timing channel in Password.java. 2017-05-16 10:41:08 +02:00
Simone Bordet b1b94d870e Code cleanups. 2017-05-16 10:25:34 +02:00
Greg Wilkins 155e3e9bcd Issue #1546 - more cookie fixes 2017-05-16 06:05:55 +02:00
Greg Wilkins 5141085fed Issue #1546 - more cookie fixes 2017-05-15 23:34:28 +02:00
Joakim Erdfelt 1ba61e8e0c Issue #207 - removing scheduler 2017-05-15 13:38:45 -07:00
Joakim Erdfelt fc6ca37c77 Updating expectations in RequestTest from changes in CookieCutter 2017-05-15 13:22:01 -07:00
Joakim Erdfelt 4e2f6265eb Issue #207 - stabilizing testcase 2017-05-15 13:16:54 -07:00
Greg Wilkins 166736db55 Issue #1546 - more cookie leniency fixes 2017-05-15 21:01:15 +02:00
Joakim Erdfelt c5a0c5e761 Issue #1546 - more leniency testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2017-05-15 11:04:09 -07:00
Joakim Erdfelt c95d6796d6 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-05-15 10:23:57 -07:00
Joakim Erdfelt ca4e72ca5d Issue #1553 - Guard against X509.isCertSign AIOOBE 2017-05-15 10:23:22 -07:00
Joakim Erdfelt cf589fca83 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-15 10:08:10 -07:00
Joakim Erdfelt 77252270ff Post-merge cleanup 2017-05-15 10:06:47 -07:00
Joakim Erdfelt 04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -07:00
Joakim Erdfelt 3966dce6df Issue #207 - Disabling CDI + WebSocket tests temporarily 2017-05-15 09:12:12 -07:00
Joakim Erdfelt 1819fed959 Fixing javadoc errors 2017-05-15 08:58:12 -07:00
Joakim Erdfelt 4fe9264bb2 Fixing build issue 2017-05-15 08:01:13 -07:00
Greg Wilkins 04fe477e79 Issue #1546 Fixed cookie tests 2017-05-13 16:21:06 +02:00
Greg Wilkins bdeea10a6f Issue #1546 Fixed some tests. @Ignored for now 2017-05-13 09:12:11 +02:00