2059 Commits

Author SHA1 Message Date
Greg Wilkins
a5d3f29f11 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-04 11:10:03 +10:00
Greg Wilkins
90110659e2 fixed javadoc 2016-05-04 10:49:22 +10:00
Greg Wilkins
3066880cd2 fixed bad merge 2016-05-04 09:53:00 +10:00
Joakim Erdfelt
86bf31aad7 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-03 11:36:25 -07:00
Joakim Erdfelt
2dbecb0843 Fixing broken javadoc 2016-05-03 11:23:10 -07:00
Joakim Erdfelt
932e0125d2 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-05-02 09:51:24 -07:00
Joakim Erdfelt
ff1ca8d993 Limiting versions that trigger !STABLE warning
+ Only RC# and M# trigger warning now.
+ Warning includes URL for where to download stable version.
2016-05-02 09:50:05 -07:00
Greg Wilkins
3e8187dcd5 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-29 16:58:00 +10:00
Greg Wilkins
c74dd571fa Issue #519 Disable SSL session caching
Set -1 defaults for session caching
2016-04-29 08:10:18 +10:00
Greg Wilkins
88c1339784 Issue #519 Disable SSL session caching
Improve the configuration of the SSL session cache
2016-04-29 08:02:41 +10:00
Greg Wilkins
092ed57a17 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-28 08:17:45 +10:00
Greg Wilkins
5f7a32e30e warning if not stable release 2016-04-28 08:15:06 +10:00
Joakim Erdfelt
301fc12d98 Merge branch 'jetty-9.3.x' 2016-04-25 12:11:38 -07:00
Greg Wilkins
65d949a386 Issue #518 jarfile fix for springboot 2016-04-25 18:15:38 +10:00
Greg Wilkins
f3b3741a58 Issue #533 Do not hide file resource exception
Throw IOException rather than MUE for file exception
2016-04-23 09:43:21 +10:00
Greg Wilkins
2c197878bd Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-23 09:38:30 +10:00
Greg Wilkins
bf5b6f8939 Issue #533 Do not hide file resource exception
ignore exception
2016-04-23 09:36:19 +10:00
Greg Wilkins
ec8e1055e3 Issue #533 Do not hide file resource exception
Add exception as suppressed
2016-04-23 09:36:19 +10:00
Greg Wilkins
132cd097ce Issue #519 Disable SSL session caching
Improved javadoc
wired up session cache size correctly
2016-04-23 09:36:19 +10:00
Simone Bordet
b3fa4abaa0 Merged branch 'jetty-9.3.x' into 'master'. 2016-04-14 23:45:48 +02:00
Joakim Erdfelt
939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt
778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt
47bbd9364d Revert "Updating to version 9.2.16.v20160414"
This reverts commit 29ae63855b6a63e7dbbf714012f68f32d032d266.
2016-04-14 13:19:59 -07:00
Joakim Erdfelt
29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Simone Bordet
a37fdcd0e2 Fixes #514 - Allow ExecutionStrategy to be configurable.
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:28:52 +02:00
Simone Bordet
6827c5b045 Fixes #514 - Allow ExecutionStrategy to be configurable.
Introduced setters and constructor parameters to components that use
ExecutionStrategy.
2016-04-14 12:20:31 +02:00
Joakim Erdfelt
6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Greg Wilkins
eeb42338fc Merge pull request #468 from thesnowgoose/master
Improve canonicalPath method in URIUtil.java contemplating new test added on issue #466
2016-04-05 15:12:06 +10:00
Greg Wilkins
92904d2b7d Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 13:30:01 +10:00
Greg Wilkins
8f74ff3585 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-05 10:01:22 +10:00
Greg Wilkins
557ca69f59 Merge branch 'jetty-9.3.x' into issue-472 2016-04-05 10:00:09 +10:00
Greg Wilkins
424f0c1e04 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-04-05 09:57:28 +10:00
thesnowgoose
0c735881c2 Replaced LinkedList for ArrayList 2016-04-02 10:31:54 -07:00
Simone Bordet
cdcde53c6b Merged branch 'jetty-9.3.x' into 'master'. 2016-04-01 14:44:50 +02:00
Simone Bordet
ce04cadb79 Fixes #233 - Add message to idle TimeoutException. 2016-04-01 14:44:26 +02:00
Greg Wilkins
91bef55924 Issue #472 Use LongAdder for statistics
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-04-01 17:22:45 +11:00
thesnowgoose
82559c8dde Fix broken test
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-30 11:23:44 -07:00
Greg Wilkins
3590abc534 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-30 20:05:59 +11:00
Greg Wilkins
c768828703 Issue #458 Improve Quality list handling
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
2016-03-30 19:07:11 +11:00
Greg Wilkins
9becd5e0dd added unit test to check #460 2016-03-30 18:56:55 +11:00
Greg Wilkins
330d21d27f Revert "Merge pull request #460 from thesnowgoose/master"
This reverts commit f5ba7ae197fe35730325893d3634421ca7c58d16, reversing
changes made to 0fe1bbcd91ca8d3c0a79471ea964cb7279a5cfe9.

The change fails for /foo/../../bar paths, as it returns bar rather than null
2016-03-30 18:55:09 +11:00
thesnowgoose
f1cd6f6e4d Improve canonicalPath method in URIUtil.java
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-29 18:01:55 -07:00
thesnowgoose
7f0fbff17e Improve canonicalPath method in URIUtil.java
Signed-off-by: thesnowgoose <lcarrasco@nearsoft.com>
2016-03-29 12:49:56 -07:00
Joakim Erdfelt
4822bea0b1 Issue #438 - File and Path Resources with control characters should be rejected
+ Removing regex
+ Adding StringUtil.indexOfControlChars()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-03-18 11:51:32 -07:00
Joakim Erdfelt
05691e1646 Issue #438 - File and Path Resources with control characters should be rejected
+ Adding testcases
+ Cleaning up unit tests, adding more
+ Fixing one testcase related to FileResource.addPath()
+ Adding validation of filesystem paths

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-03-17 16:13:07 -07:00
Joakim Erdfelt
3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Joakim Erdfelt
13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins
1c5a1fc6a2 Issue #431
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Joakim Erdfelt
1b1c331763 Fixing merge detritus 2016-03-15 09:28:47 -07:00