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
7ec6e2e899
486930 - Selector does not correctly handle rejected execution exception
...
Improved comments and unit test
2016-02-01 17:18:42 +01:00
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
599696bfc5
Merge branch 'master' into session-refactor
2016-02-01 16:57:35 +01:00
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
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
ac1afed323
Merge branch 'master' of https://github.com/eclipse/jetty.project
2016-01-19 20:17:23 +01:00
e0ce545ad7
Updating to version 9.3.8-SNAPSHOT
2016-01-15 17:15:14 -07:00
c0b191119b
Updating to version 9.3.7.v20160115
2016-01-15 16:40:15 -07:00
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
c5cbc64e77
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-01-14 11:00:06 +11:00
0a1b0b2bc6
485714 - Update SSL configuration to mitigate SLOTH vulnerability
2016-01-13 15:00:16 -07:00
41329dccc4
Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability"
...
This reverts commit 46ed803023
2016-01-13 15:38:27 +11:00
46ed803023
485714 - Update SSL configuration to mitigate SLOTH vulnerability
2016-01-13 15:18:13 +11:00
e2a0794d91
485712 - Quickstart web.xml is absolute
2016-01-13 12:47:25 +11:00
9146d11746
485031 two PathWatcher threads running after automatically restarting webapp
2016-01-09 10:32:15 +11:00
75b84374e0
485031 two PathWatcher threads running after automatically restarting webapp
2016-01-09 10:27:33 +11:00
f519aa28fb
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-01-05 11:40:57 +01:00
50100ca86d
Fixed copyright blurbs.
2016-01-05 11:30:38 +01:00
4032b8579a
Happy New Year 2016 (take #2 )
2016-01-04 15:14:27 -07:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
3fb354f884
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-21 13:02:04 +01:00
71150a939c
javadoc fixes
2015-12-18 14:21:10 -07:00
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
24b9d39c0f
Javadoc updates
2015-12-18 11:02:32 -07:00
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
c122569d75
Invalidate session if load finds it is expired; ensure locks reentrant
2015-12-18 17:45:10 +11:00
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
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
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
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
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
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
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
5e3fbbccd0
Backporting GzipHandler's IncludeExclude configs
2015-12-08 15:51:25 -07:00
7cdc58e6b9
Merge branch 'jetty-9.2.x' into feature/gziphandler-config
2015-12-08 14:56:26 -07:00
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
4ea1bb0233
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-08 22:20:28 +01:00
8d6206b8c7
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2015-12-08 22:20:05 +01:00
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
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
6d3d912b0b
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 16:18:00 -07:00
481102db30
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 15:53:46 -07:00
cea05f17d9
483119 - CachingWebAppClassLoader breaks JSP
...
Cleaned up debugging and impl. No fix for JSP problem
2015-11-27 10:39:52 +11:00
81b2a6a4de
483059 Remove cache of authenticated users
2015-11-26 15:31:19 +11:00
12e1974fd9
482172 - Report form key size count in UrlEncoded exceptions
...
+ Fixing ISE message format/syntax
2015-11-24 08:51:22 -07:00
f2bd05747e
482058 - MultiPartInputStream test initial part boundary incorrectly allows empty string
2015-11-24 08:51:22 -07:00
21388d4765
482057 - MultiPartInputStream temp file permissions should be limited to user
2015-11-24 08:51:22 -07:00
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
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
b800ffc983
481717 - Make Callback and Promise CompletableFuture-friendly.
...
Introduced methods from(CompletableFuture) and subclass Completable.
2015-11-09 17:38:35 +01:00
8ed67c009f
Removed usages of deprecated Callback.Adapter class.
2015-11-09 12:35:58 +01:00
edf686fe0a
Updating to version 9.3.7-SNAPSHOT
2015-11-06 12:13:00 -07:00
d737e1c638
Updating to version 9.3.6.v20151106
2015-11-06 11:09:32 -07:00
ec8f8d3e4f
Updating to version 9.2.15-SNAPSHOT
2015-11-06 11:06:48 -07:00
ecba378f5c
Updating to version 9.2.14.v20151106
2015-11-06 10:32:14 -07:00
3789c73ba3
Merged branch 'jetty-9.3.x' into 'master'.
2015-10-27 15:33:21 +01:00
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
1ebb470a38
479179 Fixed NPE from debug
2015-10-17 09:39:19 +11:00
570c751ec8
479179 Fixed NPE from debug
2015-10-17 09:37:43 +11:00
d5dab98546
start.jar uses shaded jetty-util classes
2015-10-15 15:42:28 +11:00
58e282fa6c
Added file headers to TopologicalSort
2015-10-15 15:40:35 +11:00
20cb70935c
Improved TopologicalSort javadoc
2015-10-15 15:40:35 +11:00
32c71261e1
Topological sort utility
2015-10-15 15:40:35 +11:00
dde32787c4
Updating to version 9.3.6-SNAPSHOT
2015-10-12 15:47:37 -07:00
29722bd880
Updating to version 9.3.5.v20151012
2015-10-12 15:10:39 -07:00
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
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
697b0cccf2
477895 Prevent leak of handles to deleted files after redeploy
2015-09-30 13:39:31 +10:00
3dcdb9f802
Merged branch '477878' into 'master'.
2015-09-25 19:34:45 +02:00
6544af8ce7
Improved IllegalStateException message.
2015-09-25 19:24:32 +02:00
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
dcb4c0d0a8
478372 - JavaUtilLog setSourceClass and setSourceMethod
2015-09-25 12:45:46 +10:00
46a611caac
476720 getTrustStoreResource fixed
2015-09-24 17:26:01 +10:00
131a471c8f
478008 Do not reset current value of CounterStatistics
2015-09-24 17:19:48 +10:00
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
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
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
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
03a601f2b2
477385 Make jetty osgi manifests only resolve jetty packages against a single distro version
2015-09-16 19:13:47 +10:00
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
6409366499
[maven-release-plugin] prepare for next development iteration
2015-08-27 10:11:29 -05:00
3086adc965
[maven-release-plugin] prepare release jetty-9.3.3.v20150827
2015-08-27 10:11:21 -05:00
f5d1fb1058
Merge branch 'master' into release-9.3.3
2015-08-27 08:31:22 -05:00
bee5437bad
475927 - SecureRequestCustomizer fails to match host.
...
Cosmetic changes during review.
2015-08-27 11:14:33 +02:00
8070ce61f3
475927 - SecureRequestCustomizer fails to match host.
...
Moved host and wildcard to new X509 class
2015-08-27 12:25:52 +10:00
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
f8734f23ce
[maven-release-plugin] prepare for next development iteration
2015-08-25 14:10:01 -05:00
e9edf4c24b
[maven-release-plugin] prepare release jetty-9.3.3.v20150825
2015-08-25 14:09:54 -05:00
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
22babda3f9
472411 PathResource.checkAliasPath() typo
2015-08-19 09:54:04 +10:00
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
69b90ef59b
474888 - HttpClient JMX support.
2015-08-13 15:16:14 +02:00
791896339d
Fixing javadoc
2015-08-12 14:22:53 -07:00
542ef22ba8
Merged branch 'jetty-9.2.x' into 'master'.
2015-08-05 17:50:25 +02:00
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
Jan Bartel
Greg Wilkins
Joakim Erdfelt
Julien Gouesse
Simone Bordet
Jesse McConnell