Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,355 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

2067 Commits

Author SHA1 Message Date
Simone Bordet caa45283c7 Fixes #547 (ExecuteProduceConsume (EWYK) does not exit low threads mode) 
Exposed getters/setters for ExecutionStrategy.Factory in
ServerConnector and SelectorManager, to allow explicit configuration
and testing.

Added test to verify that EPC exits low threads mode.
 2016-05-06 17:10:46 +02:00
Simone Bordet 903a6cb49c Expanded static imports. 2016-05-06 17:10:46 +02:00
Greg Wilkins 15480a7c94 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-05-05 11:37:00 +10:00
Greg Wilkins c77df55bb6 Issue #547 EWYK leaves low resource mode 
Merged code cleanups
 2016-05-05 11:35:32 +10:00
Greg Wilkins 6591137ba0 Issue #547 EWYK leaves low resource mode 
Directly implement PEC in EPC low resource mode
 2016-05-05 11:22:37 +10:00
Simone Bordet 4d4ecfd5cf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-05-04 11:47:54 +02:00
Simone Bordet e6e63d5549 Code cleanups. 2016-05-04 11:46:59 +02:00
Simone Bordet a0bd9d3887 Fixes #546 (Guard concurrent calls to ExecutionStrategy.execute()) 
Guarded invocations to execute() with a state change.
 2016-05-04 11:43:50 +02:00
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 29ae63855b.
 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 f5ba7ae197, reversing
changes made to 0fe1bbcd91.

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
Joakim Erdfelt dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Simone Bordet 26f8deddf7 Introduced Callback.Nested. 
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
 2016-03-15 15:24:44 +01:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Greg Wilkins 0c14432db3 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-10 12:44:41 +11:00
Greg Wilkins fa8b1c9220 Revert "Issue #414 ContainerLifeCycle should not stop failed component on remove" 
This reverts commit 34c8ded756.
The test is a race and failed components should be stopped when removed so listeners can be called.
 2016-03-10 12:42:50 +11:00
Greg Wilkins eac3a4a439 Merge branch 'jetty-9.3.x' 2016-03-10 12:35:44 +11:00
Greg Wilkins 34c8ded756 Issue #414 ContainerLifeCycle should not stop failed component on remove 
Only stop isRunning components when removed
 2016-03-10 12:29:02 +11:00
Simone Bordet 13f267bf8a Merged branch 'jetty-9.3.x' into 'master'. 2016-03-07 16:11:41 +01:00
Greg Wilkins d48cfcdb62 Issue #397 Multipart EOF handling 
read to EOF when reading multipart.
 2016-03-05 17:50:56 +01:00
Simone Bordet 2c11372bc4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-29 17:17:09 +01:00
Simone Bordet cec3694355 Consistently using BufferUtil, especially clearToFill() and 
flipToFlush().
 2016-02-29 16:31:38 +01:00
Osman Üngür 966cffccb8 Fix typo in annotation 
Signed-off-by: Osman Ungur <osmanungur@gmail.com>
 2016-02-26 19:37:27 +02:00
Greg Wilkins 92c339e669 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-17 12:09:00 +01:00
Jan Bartel 11d3448e28 Issue #81 Exception not always thrown in Jetty to application when upload part is too big 
Issue #82 Request.getPart() that results in Exception still allows other parts to be fetched
 2016-02-16 17:43:56 +01:00
Greg Wilkins 26217a73c1 Merge pull request #72 from gouessej/master 
Bug 485625 - Allow overriding the conversion of a String into a Crede…
 2016-02-15 12:56:15 +01:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet 6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet 145e4bee71 487511 - Jetty HTTP won't work on turkish systems. 
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
 2016-02-09 17:50:26 +01:00
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Jan Bartel 1b7045babd 486394 Make old behaviour of MultiPartInputStreamParser configurable 2016-02-03 14:15:15 +01:00
Jan Bartel d151143556 Revert "486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file" 
This reverts commit 734d18fb93.
 2016-02-03 14:15:15 +01:00
Greg Wilkins 7ec6e2e899 486930 - Selector does not correctly handle rejected execution exception 
Improved comments and unit test
 2016-02-01 17:18:42 +01:00
Greg Wilkins c81dcfc790 486930 - Selector does not correctly handle rejected execution exception 
This fix work in two ways:

1) Both the PEC and EPC strategies when confronted with a
RejectedExecutionException will continue to Produce rather than consume.

2) If a produced Runnable cannot be consumed and it supports the new Rejectable interface,
then it's reject() method is called by the producer thread.    Typically this is implemented
to close the connection - with the risk being that the close might block, but that is
probably better than leaking the connection?
 2016-02-01 17:10:24 +01:00
Jan Bartel 599696bfc5 Merge branch 'master' into session-refactor 2016-02-01 16:57:35 +01:00
Jan Bartel a8c29334ca Merge branch 'master' into session-refactor 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
 2016-02-01 13:59:12 +01:00
Joakim Erdfelt 734d18fb93 486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file 
+ Refactored fileSizeThreshold logic so that a configuration value of
   0 is always create file
   (negative) is never create file
   positive is tested against filesize
 2016-01-22 14:07:51 -07:00
Julien Gouesse ac1afed323 Merge branch 'master' of https://github.com/eclipse/jetty.project 2016-01-19 20:17:23 +01:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Julien Gouesse 7ab6127e33 Bug 485625 - Allow overriding the conversion of a String into a Credential 
Signed-off-by: Julien Gouesse <gouessej@orange.fr>
 2016-01-15 18:51:37 +01:00
Greg Wilkins c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt 0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Greg Wilkins 41329dccc4 Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability" 
This reverts commit 46ed803023.
The fix broke several unit tests.
 2016-01-13 15:38:27 +11:00
Greg Wilkins 46ed803023 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:18:13 +11:00
Greg Wilkins e2a0794d91 485712 - Quickstart web.xml is absolute 2016-01-13 12:47:25 +11:00
Jan Bartel 9146d11746 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:32:15 +11:00
Jan Bartel 75b84374e0 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:27:33 +11:00
Simone Bordet f519aa28fb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-05 11:40:57 +01:00
Simone Bordet 50100ca86d Fixed copyright blurbs. 2016-01-05 11:30:38 +01:00
Joakim Erdfelt 4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Simone Bordet 3fb354f884 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-21 13:02:04 +01:00
Joakim Erdfelt 71150a939c javadoc fixes 2015-12-18 14:21:10 -07:00
Joakim Erdfelt 4a07503a09 Javadoc updates 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Loader.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java
 2015-12-18 11:06:15 -07:00
Joakim Erdfelt 24b9d39c0f Javadoc updates 2015-12-18 11:02:32 -07:00
Joakim Erdfelt 47eb7f02a9 437786 - SslContextFactory: Allow Password.getPassword to be overridden 
+ Allowing password management in SslContextFactory to be overridden
  with new methods .newPassword(String pw) and .getPassword(String realm)
 2015-12-18 10:44:49 -07:00
Jan Bartel c122569d75 Invalidate session if load finds it is expired; ensure locks reentrant 2015-12-18 17:45:10 +11:00
Greg Wilkins 133e9e054d Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
 2015-12-18 12:50:19 +11:00
Greg Wilkins 5cd676581c 484622 - Improve handling of Direct and Mapped buffers for static content 
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer.  Thus content size may be 0, 1 or 2 times the
file size.

Some more limited unit tests
 2015-12-18 12:36:27 +11:00
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
 2015-12-17 12:51:57 -07:00
Joakim Erdfelt 7c5bec1b48 Using Java 8 Predicate Function 
+ Removing jetty-util (java 7) holdover Predicate.java
+ Converting use to (java 8) java.util.function.Predicate
 2015-12-17 10:15:57 -07:00
Joakim Erdfelt 343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
	jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
	jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
 2015-12-16 12:56:13 -07:00
Joakim Erdfelt 6e0ad429d9 484350 - Allow GzipHandler path include/exclude to use regex 
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths

Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
 2015-12-15 15:23:29 -07:00
Joakim Erdfelt b6df9508c6 484350 - Allow GzipHandler path include/exclude to use regex 
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths
 2015-12-14 14:58:12 -07:00
Joakim Erdfelt 5e3fbbccd0 Backporting GzipHandler's IncludeExclude configs 2015-12-08 15:51:25 -07:00
Joakim Erdfelt 7cdc58e6b9 Merge branch 'jetty-9.2.x' into feature/gziphandler-config 2015-12-08 14:56:26 -07:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String) 
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2015-12-08 14:54:33 -07:00
Simone Bordet 4ea1bb0233 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 22:20:28 +01:00
Simone Bordet 8d6206b8c7 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 22:20:05 +01:00
Simone Bordet 1693dd135d 483857 - jetty-client onComplete isn't called in case of exception in GZIPContentDecoder. 
Fixed by catching the exceptions and failing the callbacks.

Also using return values from HttpReceiver to compute what to
return to the parser.
 2015-12-08 22:10:27 +01:00
Joakim Erdfelt 1e6b940942 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
 2015-12-02 11:39:52 -07:00
Joakim Erdfelt 6d3d912b0b 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 16:18:00 -07:00
Joakim Erdfelt 481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Greg Wilkins cea05f17d9 483119 - CachingWebAppClassLoader breaks JSP 
Cleaned up debugging and impl.  No fix for JSP problem
 2015-11-27 10:39:52 +11:00
Jan Bartel 81b2a6a4de 483059 Remove cache of authenticated users 2015-11-26 15:31:19 +11:00
Joakim Erdfelt 12e1974fd9 482172 - Report form key size count in UrlEncoded exceptions 
+ Fixing ISE message format/syntax
 2015-11-24 08:51:22 -07:00
Joakim Erdfelt f2bd05747e 482058 - MultiPartInputStream test initial part boundary incorrectly allows empty string 2015-11-24 08:51:22 -07:00
Joakim Erdfelt 21388d4765 482057 - MultiPartInputStream temp file permissions should be limited to user 2015-11-24 08:51:22 -07:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Simone Bordet b800ffc983 481717 - Make Callback and Promise CompletableFuture-friendly. 
Introduced methods from(CompletableFuture) and subclass Completable.
 2015-11-09 17:38:35 +01:00
Simone Bordet 8ed67c009f Removed usages of deprecated Callback.Adapter class. 2015-11-09 12:35:58 +01:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Simone Bordet 3789c73ba3 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-27 15:33:21 +01:00
Simone Bordet 487d0f2d5c 480764 - Error parsing empty multipart. 
Fixed by checking the presence of the last boundary as the first line.
 2015-10-27 15:29:56 +01:00
Greg Wilkins 1ebb470a38 479179 Fixed NPE from debug 2015-10-17 09:39:19 +11:00
Greg Wilkins 570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Greg Wilkins d5dab98546 start.jar uses shaded jetty-util classes 2015-10-15 15:42:28 +11:00
Greg Wilkins 58e282fa6c Added file headers to TopologicalSort 2015-10-15 15:40:35 +11:00
Greg Wilkins 20cb70935c Improved TopologicalSort javadoc 2015-10-15 15:40:35 +11:00
Greg Wilkins 32c71261e1 Topological sort utility 2015-10-15 15:40:35 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Greg Wilkins 540b33e64c 478372 - JavaUtilLog setSourceClass and setSourceMethod 
Log ignored only if log level is all
turn off java util logging in embedded examples
 2015-09-30 16:24:11 +10:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Simone Bordet 3dcdb9f802 Merged branch '477878' into 'master'. 2015-09-25 19:34:45 +02:00
Simone Bordet 6544af8ce7 Improved IllegalStateException message. 2015-09-25 19:24:32 +02:00
Greg Wilkins 007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod 
Added some additional features to configure the java.util.logging mechansim
 2015-09-25 14:08:31 +10:00
Greg Wilkins dcb4c0d0a8 478372 - JavaUtilLog setSourceClass and setSourceMethod 2015-09-25 12:45:46 +10:00
Greg Wilkins 46a611caac 476720 getTrustStoreResource fixed 2015-09-24 17:26:01 +10:00
Greg Wilkins 131a471c8f 478008 Do not reset current value of CounterStatistics 2015-09-24 17:19:48 +10:00
Greg Wilkins f708f79b13 477817 Fixed memory leak in QueuedThreadPool 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
 2015-09-21 11:42:08 +10:00
Greg Wilkins 3c4eb5c4f6 477817 Fixed memory leak in QueuedThreadPool 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/QueuedThreadPool.java
 2015-09-21 11:39:29 +10:00
Joakim Erdfelt d39677a635 477757 - Null args in TypeUtil .call & .construct result in confusing exceptions 
+ Not allowing null class references
+ Allowing null argument lists
 2015-09-17 17:05:27 -07:00
Greg Wilkins 2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags 
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
 2015-09-17 18:19:58 +10:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Simone Bordet b36b2a9458 477385 - Problem in MANIFEST.MF with version 9.2.10 / 9.2.13. 
Reintroduced class SpinLock, for compatibility sake when working with
mixed versions of Jetty.
 2015-09-15 10:08:05 +02:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f5d1fb1058 Merge branch 'master' into release-9.3.3 2015-08-27 08:31:22 -05:00
Simone Bordet bee5437bad 475927 - SecureRequestCustomizer fails to match host. 
Cosmetic changes during review.
 2015-08-27 11:14:33 +02:00
Greg Wilkins 8070ce61f3 475927 - SecureRequestCustomizer fails to match host. 
Moved host and wildcard to new X509 class
 2015-08-27 12:25:52 +10:00
Simone Bordet 7057dae67b 475927 - SecureRequestCustomizer fails to match host. 
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
 2015-08-26 20:36:43 +02:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Simone Bordet 545fa0f72b 475605 - Add support for multi-homed destinations. 
If DNS lookup returns multiple IP addresses, HttpClient tries to
connect to the first; failing that, to the second, and so on.
 2015-08-24 12:31:08 +02:00
Greg Wilkins 22babda3f9 472411 PathResource.checkAliasPath() typo 2015-08-19 09:54:04 +10:00
Simone Bordet 805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates. 
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
 2015-08-17 20:55:20 +02:00
Simone Bordet 69b90ef59b 474888 - HttpClient JMX support. 2015-08-13 15:16:14 +02:00
Joakim Erdfelt 791896339d Fixing javadoc 2015-08-12 14:22:53 -07:00
Simone Bordet 542ef22ba8 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-05 17:50:25 +02:00
Simone Bordet e0039a95e8 474321 - Allow synchronous address resolution. 
Refactored SocketAddressResolver into interface and one sync and one
async implementations. Added getter/setter methods to HttpClient.
 2015-08-05 16:51:16 +02:00
Greg Wilkins 1cf0e0e500 removed duplicate 2015-08-05 15:26:08 +10:00
Greg Wilkins 4939854893 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-08-05 14:58:08 +10:00
Greg Wilkins a0a2c64f6a 474025 - SslContextFactory does not work with JCEKS Keystore 2015-08-05 12:03:38 +10:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Joakim Erdfelt 3f85fbbbd2 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:44:43 -07:00
Joakim Erdfelt b954a2dad5 Unit testing upgrades 
+ Using jetty-test-helper 3.0
+ Adding jetty-perf-helper (replacement for BenchmarkHelper)
+ Adding JmxServiceConnection to jetty-deploy (formerly part of
  jetty-test-helper)
 2015-07-23 12:16:50 -07:00
Joakim Erdfelt 0b7246a0f0 Fixing javadoc 2015-07-23 09:21:15 -07:00
Greg Wilkins 32e63eb0fd Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-07-23 22:51:57 +10:00
Greg Wilkins c9c2ebc532 473266 - Better handling of MultiException 
Add extra exceptions as suppressed exceptions
 2015-07-23 22:50:20 +10:00
Greg Wilkins df6b935b94 470351 Fixed SNI matching of wildcard certificates 2015-07-23 19:49:06 +10:00
Greg Wilkins 6123605694 fixed merge 2015-07-23 12:00:11 +10:00
Greg Wilkins e1faa5c1e9 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IO.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
 2015-07-23 11:34:59 +10:00
Greg Wilkins ac8316756c 473322 - GatherWrite limit handling 2015-07-23 11:32:28 +10:00
Greg Wilkins 7686a19db9 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-07-23 11:21:22 +10:00
Greg Wilkins 085ec933c5 473294 - Fixed include cipher suites support for wildcards 2015-07-23 09:36:19 +10:00
Greg Wilkins 3244088565 473266 - init MultiException cause 2015-07-23 09:04:10 +10:00