Commit Graph

2318 Commits

Author SHA1 Message Date
Greg Wilkins ea74d86f6f Fixes #1368 2017-06-08 11:21:13 +02:00
Greg Wilkins ad76aa6c65 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 17:07:14 +02:00
Greg Wilkins e55f528643 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-06 17:05:33 +02:00
Greg Wilkins 70d55252b9 Issue #1503 Optionally strip IPv6. Fixed inverted boolean 2017-06-06 17:05:07 +02:00
Greg Wilkins 380b7d21e9 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 16:58:23 +02:00
Greg Wilkins 829815be5e Merge branch 'jetty-9.4.x' 2017-06-06 16:57:44 +02:00
Greg Wilkins 55ee9279e1 Issue #1503 Optionally strip IPv6 2017-06-06 16:53:49 +02:00
Joakim Erdfelt 5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt 3e83908c58 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-06-05 10:02:01 -07:00
Simone Bordet b953f8d2d0 Merged branch 'jetty-9.4.x' into 'master'. 2017-06-05 18:07:51 +02:00
olivier lamy 16f441541b unit test must not force a maven repository path #1574
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-05 21:29:59 +10:00
Greg Wilkins 80e964ef35 Issue #1468 Configure PKIX Revocation Checker for SslContextFactory 2017-06-01 13:58:07 +02:00
Greg Wilkins 32bc9292a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 11:56:47 +02:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570)
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
Greg Wilkins d3e50f8f80 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-22 23:37:51 +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
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
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
Joakim Erdfelt ca4e72ca5d Issue #1553 - Guard against X509.isCertSign AIOOBE 2017-05-15 10:23:22 -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 3521c76d53 Missing license header 2017-05-12 10:14:16 -07:00
Joakim Erdfelt 5e0d11cfc3 Issue #1108 - adding SslContextFactory.dump() selection details
+ Protocol selection details
+ Cipher Suites selection details

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
2017-05-12 09:29:27 -07:00
Greg Wilkins cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02:00
Greg Wilkins 4ab08c0e80 Issue #1539 decode path in jar:file 2017-05-10 14:24:10 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Simone Bordet 146a1d5ed5 Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 22:17:06 +02:00
Greg Wilkins 179d40edcb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-02 12:40:44 +02:00
Greg Wilkins f2721d3407 Issues #1513 #1515
Fixed and tested backup file
2017-05-02 12:40:00 +02:00
Greg Wilkins 58492b3ebc fixed merge 2017-05-02 12:14:00 +02:00
Greg Wilkins 9cc23b1901 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-02 11:49:01 +02:00
Greg Wilkins 1f8b48cb83 Issues #1513 #1515
Fixed removed of old files.
Added test to check file handling
2017-05-02 11:47:32 +02:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 002ba9cf00 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
Conflicts:
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
Greg Wilkins 90a90d6c76 Issue #304 Deprecated sid methods 2017-04-28 13:30:49 +02:00
Greg Wilkins 89bb7db58c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-28 11:40:26 +02:00