946 Commits

Author SHA1 Message Date
Greg Wilkins
08a000b7a7 Issue #1520 wrong IO 2017-08-28 16:28:18 +10:00
Greg Wilkins
5f34e0bce8 Issue #1520 2017-08-28 16:03:51 +10:00
Greg Wilkins
6390b335fc Issue #1520
Removed a lot of cruft from this class that had accumulated over the years.
Deprecated methods like setConfigPath(File) and setConfigPath(String)
removed asymmetries like setConfigPath(String) and Path getConfigPath()
removed redundant configResource field
improved jarfile extraction to work for all string setters.
do not hot reload extracted config
fixed code style issues
2017-08-28 15:59:36 +10:00
Simone Bordet
2a3deb0a10 Removed leftover System.err debug line. 2017-08-24 11:01:34 +02:00
Joakim Erdfelt
3ec5f8fa3d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-09 16:21:08 -07:00
Joakim Erdfelt
1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Josh Elser
c6d86122db Fix a bug around handling "Negotiate" case-insensitively in SpnegoAut… (#1710)
* Fix a bug around handling "Negotiate" case-insensitively in SpnegoAuthenticator

Closes #1709

Signed-off-by: Josh Elser <elserj@apache.org>

* Clean up isAuthSchemeNegotiate(String) since we don't need to use startsWith()

Signed-off-by: Josh Elser <elserj@apache.org>
2017-08-08 09:16:01 -07:00
Josh Elser
1fd3e4ad1b Sends the WWW-Authenticate header if a non-Negotiate authorization he… (#1700)
* Sends the WWW-Authenticate header if a non-Negotiate authorization header was given

Fixes #1698

Signed-off-by: Josh Elser <elserj@apache.org>

* Dumb compilation error

Signed-off-by: Josh Elser <elserj@apache.org>

* Adds a test to show the challenge is sent.

Signed-off-by: Josh Elser <elserj@apache.org>

* Refactor the conditionals per Greg's suggestion

Signed-off-by: Josh Elser <elserj@apache.org>

* Add the expected license header

Signed-off-by: Josh Elser <elserj@apache.org>
2017-08-08 09:15:45 -07:00
Joakim Erdfelt
3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Greg Wilkins
e7ef74dd4f removed deprecated test method usage 2017-08-08 09:10:25 -07:00
Joakim Erdfelt
a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Greg Wilkins
6494c2ce7c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-08-02 12:22:37 +10:00
Josh Elser
34a450cd9d Sends the WWW-Authenticate header if a non-Negotiate authorization he… (#1700)
* Sends the WWW-Authenticate header if a non-Negotiate authorization header was given

Fixes #1698

Signed-off-by: Josh Elser <elserj@apache.org>

* Dumb compilation error

Signed-off-by: Josh Elser <elserj@apache.org>

* Adds a test to show the challenge is sent.

Signed-off-by: Josh Elser <elserj@apache.org>

* Refactor the conditionals per Greg's suggestion

Signed-off-by: Josh Elser <elserj@apache.org>

* Add the expected license header

Signed-off-by: Josh Elser <elserj@apache.org>
2017-08-02 04:18:04 +02:00
Joakim Erdfelt
11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt
bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Greg Wilkins
34b25ff385 Issue #1676 removed deprecated PathMap 2017-07-18 19:59:07 +02:00
Joakim Erdfelt
a9c329859d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-07-12 13:18:12 -07:00
Joakim Erdfelt
2e8f9fc748 Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
This reverts commit 38c112764d6fb606c377e80c9ed45eed92b0a5c3.
2017-07-12 11:28:32 -07:00
Joakim Erdfelt
ee8d4c1587 gitattributes followup 2017-07-06 16:24:31 -07:00
Joakim Erdfelt
38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt
5ee1c7a533 Merge branch 'release-9.4.6' into jetty-9.4.x 2017-06-07 10:01:11 -07:00
Joakim Erdfelt
4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt
0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Greg Wilkins
10bb8c3605 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-06 12:27:52 +02:00
Greg Wilkins
c4ae7ab8d9 removed deprecated test method usage 2017-06-06 12:27:21 +02:00
Joakim Erdfelt
6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt
429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt
0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Greg Wilkins
ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02: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
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
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
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
olivier lamy
e9f75e81d9 PropertyUserStore should extract packed config file #1520
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-12 14:57:46 +10: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
cab1ec77ad Merged branch 'jetty-9.4.x' into 'master'. 2017-05-02 10:03:30 +02:00
Jan Bartel
84bc74754d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-05-01 17:53:38 +02:00
Jan Bartel
5f65f2916f Issue #1390
Remove this.web_url.path
2017-05-01 17:37:05 +02:00
Greg Wilkins
68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
olivier lamy
970cec230b prefer LOG.debug to System.err.println
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-21 11:44:50 +10:00
Jan Bartel
e1bd46023e Issue #1481
Fix bug
2017-04-20 18:10:34 +10:00
olivier lamy
9f3841d8e0 fix after review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-20 15:41:26 +10:00
olivier lamy
626327fa67 add as simple unit test #1481 2017-04-20 15:03:04 +10:00