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
1cf0e0e500
removed duplicate
2015-08-05 15:26:08 +10:00
4939854893
473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType
2015-08-05 14:58:08 +10:00
a0a2c64f6a
474025 - SslContextFactory does not work with JCEKS Keystore
2015-08-05 12:03:38 +10:00
a3684f7fb8
[maven-release-plugin] prepare for next development iteration
2015-07-30 09:47:57 -07:00
798fc8118b
[maven-release-plugin] prepare release jetty-9.2.13.v20150730
2015-07-30 09:47:48 -07:00
4b3879845d
[maven-release-plugin] prepare for next development iteration
2015-07-30 07:02:10 -07:00
6b7e9ac4b0
[maven-release-plugin] prepare release jetty-9.3.2.v20150730
2015-07-30 07:02:02 -07:00
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
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
0b7246a0f0
Fixing javadoc
2015-07-23 09:21:15 -07:00
32e63eb0fd
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-07-23 22:51:57 +10:00
c9c2ebc532
473266 - Better handling of MultiException
...
Add extra exceptions as suppressed exceptions
2015-07-23 22:50:20 +10:00
df6b935b94
470351 Fixed SNI matching of wildcard certificates
2015-07-23 19:49:06 +10:00
6123605694
fixed merge
2015-07-23 12:00:11 +10:00
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
ac8316756c
473322 - GatherWrite limit handling
2015-07-23 11:32:28 +10:00
7686a19db9
473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType
2015-07-23 11:21:22 +10:00
085ec933c5
473294 - Fixed include cipher suites support for wildcards
2015-07-23 09:36:19 +10:00
3244088565
473266 - init MultiException cause
2015-07-23 09:04:10 +10:00
30a99ddcf4
473266 - init MultiException cause
2015-07-23 09:02:52 +10:00
fa92938243
Fixing javadoc errors
2015-07-22 10:22:39 -07:00
607239028c
470727 - Thread Starvation of selector wakeups.
...
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
4bd82d74df
473006 - Encode addPath in URLResource
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2015-07-22 13:05:49 +10:00
232b4a4680
473006 - Encode addPath in URLResource
2015-07-22 13:01:21 +10:00
d8c94ea27b
Revert "473243 Delay resource close for async default content"
...
This reverts commit e4bf5d888c
2015-07-22 13:00:05 +10:00
e4bf5d888c
473243 Delay resource close for async default content
2015-07-22 12:34:56 +10:00
4b8a6e584f
Merge branch 'release-9.3.1'
2015-07-17 12:10:49 -05:00
edc8bae556
472781 - GzipHandler isMimeTypeGzipable() bad logic
...
Added utility classes:
IncludeExclude - handles standard include exclude set
RegexSet - A set of regular expressions that have a combined compiled pattern
PathMap.PathSet - A set of standard path mappings
2015-07-17 16:28:48 +10:00
9ee4b64e89
472781, 472782 Improve GzipHandler Include/Exclude handling
...
Fixed javadoc
2015-07-17 11:54:18 +10:00
a4a12e0e19
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-07-17 11:49:37 +10:00
de39bf5227
472781, 472782 Improve GzipHandler Include/Exclude handling
...
Made a common utility class for include/exclude handling
Use path exclusion rather than mime exclusion for svg
2015-07-17 08:11:11 +10:00
01497cc530
Bug 472601: fix typo
...
Signed-off-by: John Myers <jgmyers@proofpoint.com>
2015-07-15 20:55:20 -07:00
15c83cf7ce
Bug: 472601 org.eclipse.jetty.util.log.Log.setLog(Logger) fixed
2015-07-16 09:28:42 +10:00
c5b36c6353
Bug 472601: org.eclipse.jetty.util.log.Log.setLog(Logger) fixed
2015-07-16 09:10:08 +10:00
deba2f0d6a
472621 - Unjustified timeout when serving static content
...
Created HttpConfiguration.setBlockingTimeout as a new timeout to apply to the total read/write operation.
Default is -1, which is no overall timeout and only the idle timeout will apply.
2015-07-15 17:09:18 +10:00
9b790c38ce
[maven-release-plugin] prepare for next development iteration
2015-07-14 11:42:34 -05:00
b35d32f2b8
[maven-release-plugin] prepare release jetty-9.3.1.v20150714
2015-07-14 11:42:28 -05:00
c2615d5fbd
472411 - PathResource.checkAliasPath typo
2015-07-12 21:33:15 +10:00
04f4448281
472310 Improved logging when no supported included ciphers
2015-07-10 09:46:32 +10:00
7204707902
[maven-release-plugin] prepare for next development iteration
2015-07-09 12:14:38 -05:00
3b1533673e
[maven-release-plugin] prepare release jetty-9.2.12.v20150709
2015-07-09 12:14:30 -05:00
7340a4d9b2
464294 AsyncNCSARequestLog blocks JVM exit after failure
...
Made async writer thread a daemon
AbstractContainerLifeCycle stops failed beans
2015-07-08 17:43:55 +10:00
7fbf512b17
471985 NPE in HttpFields.putField
...
The problem had several aspects:
* HttpField.add should not let a null entry be added to the fields
* The putHeaders methods should have checked for a null field before trying to add it
* But the fundamental problem was the JarFileResource.close was leaving exist==true, so a new entry was never created.
2015-07-08 16:07:37 +10:00
83fcdda906
470727 - Thread Starvation with EWYK
...
Added constructor to allow low resources strategy to be pluggable within EWYK
2015-07-03 22:54:59 +10:00
8d869bf88b
470727 - Thread Starvation with EWYK
...
Implemented NonBlockingCallbacks and fallback to PEC scheduling
2015-07-01 17:21:53 +10:00
07c81d6ec7
Bug: 470790 Fixed alias checking of symlinked directories
2015-06-24 12:28:50 +10:00
814000531f
Bug: 447781 Allow additional methods to be x-www-form-encoded
...
Added configuration to the HttpConfiguration class to allow additional methods to be set as
acceptable for x-www-form-encoding.
2015-06-24 11:45:44 +10:00
3e401a62e9
StringUtil.csvSplit(String)
2015-06-19 16:48:53 +10:00
1a572c3236
improved Dump
2015-06-18 17:24:06 +10:00
60e45a940e
[maven-release-plugin] prepare for next development iteration
2015-06-15 15:34:11 -05:00
d3dec8d513
[maven-release-plugin] prepare release jetty-9.2.12.M0
2015-06-15 15:34:03 -05:00
cf6c4a914e
Updating version to 9.3.1-SNAPSHOT
2015-06-15 10:25:49 -07:00
1a9da9f9e4
Updating versions to 9.3.0.v20150612
2015-06-12 09:34:24 -07:00
c6ac82f50b
Merge branch 'master' into release-9.3
2015-06-12 09:30:46 -07:00
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
496b4dfc83
[maven-release-plugin] prepare for next development iteration
2015-06-11 15:08:36 -07:00
f53c5d8fac
[maven-release-plugin] prepare release jetty-9.3.0.v20150611
2015-06-11 15:08:29 -07:00
b670b9e47d
Merge branch 'master' into bugs/469860
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
jetty-start/src/test/resources/assert-home-with-http2.txt
2015-06-11 06:57:16 -07:00
2c26e82fea
469936 - Remove usages of SpinLock.
...
Causes high CPU usage when contended, and the JVM can do better with
its own spin lock and biased locking.
2015-06-11 15:36:20 +02:00
9e2c578a85
469863 fixed setNeedClientAuth/setWantClientAuth
2015-06-11 10:58:24 +10:00
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
2ff20414fa
469241 Use null WatchService as loop terminator for PathWatcher.
2015-06-10 14:52:12 +10:00
74d246c1a9
469241 Ensure multiple file watches don't overwrite each other
2015-06-10 12:45:25 +10:00
f55d5633c7
Fixing broken javadoc preventing build
2015-06-09 16:46:46 -07:00
f38be3900e
allow Locker configuration
2015-06-10 08:26:50 +10:00
b18adb525f
469633 - Make SpinLock behavior pluggable.
...
Renamed SpinLock to Locker, uses ReentrantLock by default, but can be
turned into a spin lock by setting the system property
org.eclipse.jetty.util.thread.Locker.spin=true.
2015-06-08 17:15:54 +02:00
a10142fdf5
Ignore PathWatcherTest due to operating system differences
2015-06-04 21:46:16 +10:00
30e14fd256
469241 Make PathWatcher stoppable and restartable
2015-06-04 17:10:48 +10:00
e0161ab234
469241 Add ability to recurse watch to any tree depth
2015-06-04 09:40:35 +10:00
5fda111bcc
469241 Remove commented out code
2015-06-04 09:00:00 +10:00
7c375c2bce
469241 Support more of existing Scanner behaviour for PathWatcher
2015-06-03 19:00:24 +10:00
bfe6c2638e
[maven-release-plugin] prepare for next development iteration
2015-05-29 09:06:42 -05:00
71e0f4d8ce
[maven-release-plugin] prepare release jetty-9.2.11.v20150529
2015-05-29 09:06:36 -05:00
69bf5ab46c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2015-05-29 21:05:26 +10:00
4472b614b9
468747 - XSS vulnerability in HttpSpiContextHandler
2015-05-29 20:12:57 +10:00
a7087cbfbf
[maven-release-plugin] prepare for next development iteration
2015-05-28 10:06:51 -05:00
913c63e597
[maven-release-plugin] prepare release jetty-9.2.11.v20150528
2015-05-28 10:03:44 -05:00
1925867757
Merge branch 'jetty-9.2.x'
2015-05-22 15:57:02 -07:00
c9be4d10fc
468008 Scanner ignores directory length
2015-05-23 08:41:56 +10:00
b2e8d2cd04
minor optimisations
2015-05-22 22:53:01 +10:00
61e2177d9e
467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
...
Fixed removal of COW lists
2015-05-21 02:15:34 +10:00
aa8ad7d4f4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
2015-05-21 01:54:07 +10:00
bd27e7d2d4
467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
2015-05-21 01:41:12 +10:00
1a666e1bd2
Code cleanups.
2015-05-20 16:55:22 +02:00
3f0fd550dc
467702 - SslContextFactory not backward compatible
2015-05-20 22:20:33 +10:00
eb638777d0
Adding IO.close(Closeable) and using it.
2015-05-14 07:45:25 -07:00
f3601267c4
467281 Remove Java 1.7 support from Jetty 9.3
2015-05-14 11:13:04 +10:00
c5e4abd792
467281 Remove Java 1.7 support from Jetty 9.3
2015-05-14 09:31:50 +10:00
054d6b9176
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
2015-05-14 08:55:15 +10:00
e5fac304b4
467276 NPE protection in SslContextFactory
...
Also-by: P.Ottlinger<phil@edojo.org>
2015-05-14 08:32:12 +10:00
3e0b95be4f
430951 Support SNI with ExtendedSslContextFactory
...
made ExtendedSslContextFactory work with non SNI keystore
2015-05-08 12:06:20 +10:00
6428718962
457788 Powered By in o.e.j.util.Jetty conditional on sendServerVersion
...
moved conditional to HttpConfiguration
2015-05-08 09:44:19 +10:00
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
96d1e1df6e
Fixing javadoc
2015-05-01 15:30:26 -07:00
b87db668c7
Fixing PathWatcher root path handling on Windows
2015-05-01 14:49:45 -07:00
9c410f8ad9
466005 Use Files.move(src,trgt) instead of File.rename for Part.write(filename)
2015-05-01 17:43:45 +10:00
4560c5d9e6
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2015-05-01 16:47:10 +10:00
7afede170e
less info logging
2015-05-01 16:46:52 +10:00
aaf7a56a27
466005 Throw exception if rename during Part.write(filename) fails
2015-05-01 16:39:22 +10:00
0a16705947
Ignoring testcase that behaves differently enough on OSX and Windows that its hard to have a standard set of tests
2015-04-30 15:54:35 -07:00
a6b3302876
Fixing PathWatcher and Test
...
Using a trigger file (and event type) in test cases to know
when the watching & capture is truely finished (instead of
using sleep waits)
2015-04-30 11:01:22 -07:00
37738d15e5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/PathWatcherTest.java
2015-04-29 18:12:04 -07:00
cbc263da92
465854 - Provide java.nio.file.WatchService alternative for Scanner
...
+ Fix "glob:" PathMatcher behavior to work consistently
even on Windows.
2015-04-29 18:08:30 -07:00
e30c05cc2b
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
tests/test-integration/src/test/resources/BIOHttp.xml
tests/test-integration/src/test/resources/BIOHttps.xml
tests/test-integration/src/test/resources/NIOHttp.xml
tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
4b28a5f7fb
Disabling PathWatcherTest temporarily
2015-04-29 14:10:57 -07:00
fee2255a5f
465854 - Provide java.nio.file.WatchService alternative for jetty-util Scanner
...
+ Adding Proof of Concept for replacment, along with demo main, and test
cases to show how it works.
2015-04-29 12:33:10 -07:00
23216076a9
renamed EatWhatYouKill to ExecuteProduceConsume
2015-04-29 08:44:21 +10:00
c17f1982be
Making updates to FileResource and PathResource for Windows 8.1
2015-04-28 08:28:09 -07:00
71efdf0f89
465606 - IteratingCallback.close() does not fail pending callback.
...
Fixed by failing the IteratingCallback when in state PROCESSING.
2015-04-27 17:23:04 +02:00
cf9bd7e663
Removing OSX specific assume
2015-04-24 15:11:33 -07:00
c4eb2da79c
Fixing FileSystem reference techniques for OSX testing on Java 8
2015-04-24 14:44:31 -07:00
6ebfd88323
465360 URLResource.addPath should use _useCaches setting to create new Resource
2015-04-24 14:51:29 +10:00
ff8eeae982
465359 Resource.newResource(String res, boolean useCache) does not use useCache argument
2015-04-24 14:29:56 +10:00
e633189b48
457788 Powered By in o.e.j.util.Jetty
2015-04-23 11:07:30 +10:00
6ec2a50cae
430951 Support SNI with ExtendedSslContextFactory
...
relax cert constraints
2015-04-23 07:24:23 +10:00
baede130c0
430951 Support SNI with ExtendedSslContextFactory
...
exclude certificates with usages
2015-04-22 17:16:41 +10:00
c3577bbbb0
430951 Support SNI with ExtendedSslContextFactory
...
refactored common code in SniX509ExtendedKeyManager
added sniHostCheck code to ensure request host is the same as SNI host
2015-04-22 15:05:56 +10:00
293da2da2a
464727 - Update Javadoc for Java 8 DocLint
...
+ Removing @throws ServletException (no longer throws)
2015-04-21 13:59:06 -07:00
21e31d784f
430951 Support SNI with ExtendedSslContextFactory
...
Use RFC2253 name
2015-04-21 18:50:02 +10:00
2d283edf26
430951 Support SNI with ExtendedSslContextFactory
...
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
a293967287
464528 NPE protection in getIncludedCipher suites
2015-04-21 17:49:20 +10:00
1a2e625ae8
464724 MultiPartInputStreamParser.parse ServletException never thrown
2015-04-21 15:31:20 +10:00
cfb9b3f19b
464744 - PathMap.match() never throws IllegalArgumentException
2015-04-21 15:18:47 +10:00
53fdbd2ec0
430951 Support SNI with ExtendedSslContextFactory
...
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
78bf5978de
464869 - org.eclipse.jetty.util.resource.PathResource do not work
...
+ Adding os neutral testcase for adding a root directory reference
that way the test will execute on Linux, OSX, and Windows
2015-04-20 11:24:52 -07:00
6b359b942a
464869 PathResource.addPath allows absolute resolution.
...
More efficient addPath
2015-04-20 11:50:19 +10:00
aa3c881eec
464869 PathResource.addPath allows absolute resolution.
...
Added test harness to demonstrate
Applied suggested fix - which fixes the test.
Need to analyse why this every worked, why it was not detected and what are the ramifications in 9.2.x and 9.3.x releases
2015-04-20 11:34:36 +10:00
12a9c0578e
430951 Support SNI with ExtendedSslContextFactory
...
case insensitive CN
2015-04-20 10:14:40 +10:00
ae31162669
430951 Support SNI with ExtendedSslContextFactory
...
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
45b82c32a1
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixed jetty-util's javadoc
2015-04-15 14:38:35 -07:00
fd158a231b
460671 - Rationalize property names.
...
Fixed typos.
2015-04-14 22:11:59 +02:00
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
dc2221a152
Build under Java 1.8
...
+ Enforcer setup to JDK 1.8+
+ Java7 profiles removed (for now)
+ Main compile phase source/test is 1.7
+ Test compile phase source/test is 1.8
2015-04-10 13:21:12 -07:00
645ee9223c
Temp revert to make CI happy (but everything else sad)
2015-04-10 06:47:28 -07:00
d89aa3a866
Fixing compiler source for modules that now require Java 8
2015-04-09 13:32:30 -07:00
60d790cbf8
Marking java8 specifics excluded when compiling with java7
2015-04-08 15:10:53 -07:00
5ed2f84d06
430951 Support SNI with ExtendedSslContextFactory
2015-04-02 19:12:44 +11:00
0636013d65
Using test-and-test-and-set.
...
See http://en.wikipedia.org/wiki/Spinlock , the section about
optimizations.
See also http://en.wikipedia.org/wiki/Test_and_Test-and-set .
2015-03-30 18:47:07 +02:00
bf7df1fa55
463036 - system properties to set ssl password and keypasword
...
Changes so that system properties only provide default
2015-03-27 10:47:05 +11:00
fd12bb8c5c
fixed java 1.7 import
2015-03-26 13:53:03 +11:00
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
7da5db8dc9
458478 - JarFileResource improve performance of exist method
...
Use JarFile.getJarEntry() rather than interation
Also-by: alienisty@gmail.com
Signed-off-by: gregw@intalio.com
2015-03-26 12:18:06 +11:00
eca04f401a
TreeTrie getBest String implementation
2015-03-26 12:18:06 +11:00
5d14d0ca7a
removed extra HttpInput synchronization
2015-03-26 12:18:06 +11:00
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
161317a5ef
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-23 22:32:40 +01:00
79e74c64e1
Introduced a generic Sweeper.
...
The Sweeper class periodically sweeps resources added to it.
Currently used to check whether the HttpClient code does not leak
connections.
2015-03-20 00:42:24 +01:00
a9be633816
[Bug 462098] Support setting ThreadGroup in ScheduledExecutorScheduler
...
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:14:53 -04:00
c8b84e0291
[Bug 462098] Support setting ThreadGroup in QueuedThreadPool
...
Signed-off-by: John Gardiner Myers <jgmyers@proofpoint.com>
2015-03-18 18:10:56 -04:00
feed8ea158
Small refactoring of HTTP/2 upgrade code.
2015-03-12 19:08:26 +01:00
e92bcccc84
Using new Decorator
2015-03-12 10:09:53 -07:00
87246263b8
453834 - CDI Support for WebSocket
...
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
ContainerDefaultEndpointConfigurator, all others are trusted
to be complete and injected already.
2015-03-12 10:09:52 -07:00
e213c4488e
453834 - CDI Support for WebSocket
...
+ Updating javadoc
2015-03-12 10:09:30 -07:00
8b6a2629f8
453834 - CDI Support for WebSocket
2015-03-12 10:09:30 -07:00
5b5c2369d5
Stragglers to the new year. tsk. tsk.
2015-03-12 10:09:30 -07:00
0c930c8640
Rename EnhancedInstantiator to DecoratedObjectFactory
2015-03-12 10:06:03 -07:00
d6911b431f
453834 - CDI Support for WebSocket
...
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
5c3e30d136
453834 - CDI Support for WebSocket
...
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
fb88bc4c19
Making ServletContextHandler use util.Decorators
...
+ Deprecating methods that are just awkward now.
ServletContextHandler.getDecorators() - as it expects the
ServletContextHandler.Decorator version
2015-03-12 10:04:13 -07:00
2b7b5ef495
Rethinking Decorators
2015-03-12 10:04:13 -07:00
b7d719be5f
459845 - Support upgrade from http1 to http2
...
Parse setting frame.
2015-03-13 00:54:33 +11:00
870e0ab0b3
Converted IteratingCallback to use SpinLock
2015-03-11 15:37:25 +11:00
c5541cb3bd
459081 - http2 push failures.
...
Reverted sense of runnable in ExecuteProduceRun so that test harness passes.
Added RunExecute Runnable for the new dispatch semantic
2015-03-11 11:02:11 +11:00
48887377c9
459081 - http2 push failures.
...
Introduced ExecutionStrategy.dispatch() to handle the case where
resources that are being pushed block.
2015-03-11 00:12:57 +01:00
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
b7715fb3eb
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-07 23:26:59 +01:00
a13a55e242
Introduced LeakDetector.id() to be consistent in logging the resource ID.
2015-03-07 22:32:59 +01:00
130afb9535
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06 15:57:52 -07:00
74ee154bb1
Cleaning up LeakTrackingByteBufferPool / LeakDetector
...
+ Making use of LeakTrackingByteBufferPool more consistent
+ Using MappedByteBufferPool.Tagged where appropriate in test cases
+ Adding leak count tracking to LeakDetector
+ Adding leak count tracking to LeakTrackingByteBufferPool
+ Renaming websocket LeakTrackingBufferPool to
LeakTrackingBufferPoolRule to reflect junit @Rule usage
+ Making websocket LeakTrackingBufferPoolRule always use
MappedByteBufferPool.Tagged
+ Fixed various grammar concerns
2015-03-06 14:27:58 -07:00
ac08e4ded7
461623 - BufferUtil.writeTo does not update position consistently
...
+ Making position update properly
+ Marking internal method as private
2015-03-06 14:20:59 -07:00
9b5205ba40
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
2015-03-06 12:45:55 +11:00
2c3a4869ab
Tagged buffers from MappedByteBufferPool
2015-03-06 11:47:56 +11:00
32de92f7d6
Updating Leak Tracking/Detecting behavior.
...
+ NOISY logging is now configurable at JVM startup
+ Improved javadoc in LeakDetector
2015-03-05 11:06:15 -07:00
48b6bec64c
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2015-03-05 20:17:20 +11:00
e8b6902b16
SpinLock cleanup of HttpExchange
2015-03-05 18:32:17 +11:00
3162ccc299
Fixed dependency on old test helper classes.
2015-03-02 17:00:52 +01:00
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
a32c9ed79c
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
2015-02-23 18:05:19 -07:00
4df5647f6d
460642 - HttpParser error 400 can expose previous buffer contents in HTTP status reason message
2015-02-23 14:44:53 -07:00
5d6bb9f5d0
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Additional refactoring to better handle HttpInput state. Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
d6de16342f
Refining testcase
2015-02-19 15:50:47 -07:00
bdf5854610
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2015-02-19 15:02:27 -07:00
5ecc9b8a36
Adding some tests to prove out inherited lifecycle listener behavior
2015-02-19 14:43:24 -07:00
b60ea47ef4
Revert "Revert "Fixed AsyncIO double dispatch""
...
This reverts commit 8bd94ec6be
2015-02-20 00:18:29 +11:00
8bd94ec6be
Revert "Fixed AsyncIO double dispatch"
...
This reverts commit 968063c1ab
2015-02-20 00:03:40 +11:00
968063c1ab
Fixed AsyncIO double dispatch
2015-02-19 18:13:31 +11:00
363d04174d
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
onClose also a Product task
2015-02-19 13:35:58 +11:00
28d2172ea7
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Refinements to the refactored managed selector
2015-02-19 13:25:12 +11:00
e541865cef
460211 Fixed Idle race in ExecuteProduceRun
...
Fixed new race in refactored SelectorManager between attaching to key and calling onOpen
2015-02-19 13:25:12 +11:00
e18573f4a3
460211 Fixed Idle race in ExecuteProduceRun
...
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
b78faff1bf
improved exception messages during tests
2015-02-18 17:35:43 +11:00
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
0f7ee8d607
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpVersion.java
jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2015-02-13 11:45:56 +11:00
2b2a70a93a
459845 Support upgrade
...
Added the concept of UpgradeFrom and UpgradeTo connections that support
transferring a buffer with content before opening new connection.
Aded EndPoint.update method as utility
2015-02-13 11:41:18 +11:00
465f6f7da8
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-12 14:32:24 +01:00
2cd26725e1
Fixed bug in onSuccess() where the count was decreased to zero on the
...
first call to succeeded() due to not returning after the
successful compareAndSet().
2015-02-12 14:20:09 +01:00
44d262c65a
Renamed GatheringCallback to CountingCallback.
2015-02-10 13:16:41 +01:00
7dffe4f082
459542 - AsyncMiddleManServlet race condition on first download content.
...
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:16:41 +01:00
12e2f9e6c8
459542 - AsyncMiddleManServlet race condition on first download content.
...
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:10:57 +01:00
cb5541b58e
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-09 17:39:16 +01:00
1274bb9e43
Implemented dump() to print out the scheduler thread stack trace.
2015-02-09 12:13:18 +01:00
02b5732720
First take at implementing the HttpClientTransport for HTTP2.
2015-02-09 09:11:56 +01:00
b90c83250e
Merge branch 'jetty-9.2.x'
2015-01-30 11:45:40 -07:00
56ff29568f
458849 - org.eclipse.jetty.util.Uptime.DefaultImpl() not available on GAE
2015-01-30 11:45:06 -07:00
762f353e0e
Reverting default behavior of StdErrLog to original format.
...
+ Making tagPad default 0 (not 50) as this preserves backward
compatibility for those folks that rely on the output format being a
certain way.
+ Moving lookup from System properties to Logging properties format
instead
2015-01-30 10:20:42 -07:00
961a90d16c
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-29 14:11:21 +01:00
159884a9c1
458495 - CompletableCallback may not notify failures.
...
Fixed by improving the state machine, and calling abort() also in
case of synchronous failures.
2015-01-27 10:54:29 +01:00
5b42345cc6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2015-01-23 11:43:20 +01:00
7e608a70eb
458209 Length check for HttpMethod MOVE lookahead
2015-01-23 11:04:33 +01:00
c5fbb185de
457893 Close temp jar resource
2015-01-22 16:23:54 +01:00
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
629035ba7a
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
3270af81e8
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-07 19:53:30 +01:00
337d638422
Merged branch 'master' into 'jetty-9.3-ewyk'.
2015-01-06 17:32:12 +01:00
379f9f6c43
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-06 17:30:43 +01:00
3abfbe26b3
Using the provider string when creating the SSLContext in case of no
...
keystore.
2015-01-06 17:30:03 +01:00
3ad8f627e7
improved javadoc
2015-01-01 17:32:44 +01:00
beacb948b1
Allow configuration of ExecutionStrategy
...
eg -Dorg.eclipse.jetty.io.ManagedSelector.ExecutionStrategy=org.eclipse.jetty.util.thread.ExecutionStrategy$ExecuteProduceRun
2015-01-01 17:04:00 +01:00
451e27e736
454291 Added busy threads JMX attribute to QueuedThreadPool
...
Also-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-12-31 16:32:58 +01:00
20fc880c3e
Merge branch 'master' into jetty-9.3-ewyk
2014-12-31 16:29:40 +01:00
58faca9e09
430951 Improved ordering of SSL ciphers
2014-12-31 15:45:08 +01:00
fd605248dc
Bah humbug
2014-12-25 10:21:20 +01:00
fecc03a2f5
fixed some more tests after EWYK refactor
2014-12-23 22:20:49 +01:00
3f59bc4c14
refactored HttpConnector for EWYK - work in progress
2014-12-23 17:15:27 +01:00
2a584613ee
work in progress on EWYK HTTP
2014-12-21 20:56:36 +01:00
e363dd41c2
HttpConnection refactoring work in progress
2014-12-21 15:23:36 +01:00
448f150ac4
Cleaned up ExecutionStrategy by adding javadocs, removing methods not
...
used and renaming classes and methods to better names.
2014-12-19 11:25:09 +01:00
e35c51eb7d
Implemented dispatch to the application using an ExecutionStrategy.
...
Now instead of having the channel to dispatch when it detects that it
has to call the application (upon receiving a HEADERS frame, or upon
a push "fake" request), now the whole mechanism is controlled by an
ExecutionStrategy.
2014-12-18 17:14:34 +01:00
3b34423b17
EWYK SelectorManager
2014-12-18 17:06:32 +01:00
31e06b5791
refactored jetty-io to not have onFillable statemachine. work in progres...
2014-12-18 14:10:06 +01:00
37e7e5217a
updated EWYK strategy
2014-12-17 12:52:17 +01:00
f3791a9b06
minor EWYK changes
2014-12-10 13:34:11 +01:00
d5feadd241
minor EWYK changes
2014-12-10 13:30:50 +01:00
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
1ff23803f7
453627 Fixed FileSystem test for nanosecond filesystems
2014-12-04 15:02:12 +01:00
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
007b7dac1c
Merged branch 'jetty-9.2.x' into branch 'master'.
2014-11-27 12:01:02 +01:00
ae3e491f26
453386 - Jetty not working when configuring QueuedThreadPool with minThreads=0.
...
Fixed by properly initializing the queue capacity and by making sure
that if minThreads=0 at least one thread is always started to handle
the job.
2014-11-27 11:32:59 +01:00
07647e8a5f
443652 - Remove dependency on java.lang.management classes
...
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
- Server.java
- Log.java
- AbstractLifeCycle.java
2014-11-25 08:25:35 -07:00
a308c087ed
Implemented the PROXY protocol
...
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
2014-11-13 19:55:01 +11:00
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
f645b4a399
Merge branch 'jetty-9.2.x'
2014-11-05 11:12:05 -07:00
d1ead3dcd6
improved javadoc
2014-11-05 17:53:46 +11:00
50b6391be1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-11-05 10:36:57 +11:00
63d6754ea1
449594 Handle ArrayTrie overflow with false return
2014-11-05 10:32:10 +11:00
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
a6e00bc642
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
8eab088a35
443550 improved FileResource encoded alias checking
2014-10-30 14:12:43 +11:00
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
b65aed7d10
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-22 22:44:18 +11:00
921381eb7c
448156 Fixed INACTIVE race in IteratingCallback
...
More code cleanups and review
2014-10-22 22:43:24 +11:00
58b56b0cfb
fixed bad merge
2014-10-22 16:47:55 +11:00
3f76eef8d1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-10-22 16:42:23 +11:00
679b8d30f8
448156 Fixed INACTIVE race in IteratingCallback
...
Additional cleanups of ICB code
2014-10-22 16:40:28 +11:00
4bbd3e9909
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-22 14:08:52 +11:00
34782005b2
448156 Fixed INACTIVE race in IteratingCallback
...
Simplified the ICB statemachine with the addition of a lock state to handle the case of iterate() called while a
previous process() iteration is just existing.
Also added the CALLED state to replace INACTIVE when a callback is called before PENDING state entered.
renamed INACTIVE to IDLE
2014-10-22 14:06:40 +11:00
592265c21f
447627 MultiPart file always created when "filename" set in Content-Disposition
2014-10-22 12:56:59 +11:00
ba7f7589cb
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-17 14:31:22 +11:00
8bf6b2c62c
444031 Ensure exceptions do not reduce threadpool below minimum
...
improved the suppression of warnings
2014-10-17 14:29:40 +11:00
e25e2e2258
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-16 19:48:38 +02:00
90e9cfc535
447381 - Disable SSLv3 by default.
...
Excluded by default also SSLv2Hello.
2014-10-16 19:46:33 +02:00
6268421dd0
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-16 18:05:12 +02:00
aea5070e51
447381 - Disable SSLv3 by default.
...
Excluded by default SSL, SSLv2 and SSLv3.
2014-10-16 17:53:52 +02:00
1729fb045c
446923 SharedBlockingCallback does not handle connector max idle time of Long.MAX_VALUE; BlockerTimeoutException not serializable
2014-10-15 18:17:01 +11:00
6b489c78b6
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-15 11:46:42 +11:00
8a555e669a
444031 Ensure exceptions do not reduce threadpool below minimum
2014-10-15 11:22:53 +11:00
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
1f543e9983
System.lineSeparator exists
2014-10-08 11:02:13 -07:00
149ee01047
445157 First redeployed servlet leaks WebAppContext
2014-10-01 13:03:39 +10:00
a8b461fe91
Cosmetics: removed unused imports, cleaned up source code, improved javadocs.
2014-09-26 10:13:16 +02:00
90af0a4e5f
437303 - Serving of static filenames with "unwise" characters causes 404
...
error
+ Adding testcases for the rest of the unwise characters to show how
PathResource works vs the venerable FileResource
2014-09-24 15:46:08 -07:00
ffa0fc73a9
Made methods return boolean to indicate whether the update was
...
successful or not.
2014-09-23 11:33:16 +02:00
f02194d405
Made methods return boolean to indicate whether the update was
...
successful or not.
2014-09-12 12:58:35 +02:00
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
3e4c9909e0
443652 - Remove dependency on java.lang.management classes
...
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
- Server.java
- Log.java
- AbstractLifeCycle.java
2014-09-10 10:30:26 -07:00
40d84ff1e3
443662 Consume buffer in write(ByteBuffer)
2014-09-10 17:41:14 +10:00
5011993ddf
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-09-10 14:38:18 +10:00
c80f556139
Update Password.java
...
Fixed typo.
Trivial fix from github/pull/21
2014-09-10 10:06:00 +10:00
88b19abf52
[maven-release-plugin] prepare for next development iteration
2014-09-05 09:19:30 -05:00
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
3fa302e287
Removed BenchmarkHelper in favour of the version present in the jetty-test-helper.
2014-09-05 15:04:38 +02:00
07ec47adfa
improved SSL debug logging
2014-09-04 19:09:39 +10:00
5b97d652e1
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
610bac49b9
435322 Added a idleTimeout to the SharedBlockerCallback
2014-09-04 09:30:21 +10:00
ed8abd1d53
443049 Improved HttpParser illegal character messages
2014-09-04 09:27:42 +10:00
5be1fb6270
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
0a2aeb54a1
435322 Added a idleTimeout to the SharedBlockerCallback
2014-09-03 10:46:18 +10:00
bb1d4946bc
Merged branch 'master' into 'jetty-http2'.
2014-09-02 10:25:31 +02:00
7be9f0d7a4
Fixed doStop() to call super before interrupting the reference queue thread.
2014-09-01 21:16:40 +02:00
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
edcb56ae6b
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
eee2ba206e
435322 Added a idleTimeout to the SharedBlockerCallback
2014-08-29 11:55:06 +10:00
0aeebc4ec0
435988 ContainerLifeCycle: beans never stopped on remove
2014-08-27 17:13:07 +10:00
8ce96cdd2e
441475 org.eclipse.jetty.server.ResourceCache exceptions under high load
2014-08-27 14:46:22 +10:00
1c71040eca
moved config plugin to profile
2014-08-15 19:53:52 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
015c34d865
Fixed handling of the close state in case it's already closed.
2014-08-06 15:21:33 +02:00
aaa2e5c6c1
refined PathResource alias handling
2014-08-02 12:58:24 +10:00
38501a9e97
On alias resolution in PathResource, ignore NoSuchFileException (its a
...
valid and common path for 404 requested resources)
2014-08-01 14:34:21 -07:00
161bccda22
Merged branch 'master' into 'jetty-http2'.
2014-08-01 14:02:53 +02:00
75c92bf76a
438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal
2014-08-01 12:44:30 +10:00
97d723c516
deprecate FileResource
2014-08-01 10:45:11 +10:00
fa9b60c77e
Merge remote-tracking branch 'origin/jetty-http2' into pathresource
2014-08-01 10:17:42 +10:00
b439549793
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
785c45d899
Merge remote-tracking branch 'origin/master' into pathresource
2014-08-01 09:49:59 +10:00
3c716a72e7
Ignoring bad/canonical uri alias
2014-07-31 16:45:36 -07:00
f970ffc0ac
Misc cleanups done whilst fixing 435322
2014-08-01 09:02:44 +10:00
b44a29e86b
Merge branch 'pathresource' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into pathresource
2014-07-31 15:17:01 -07:00
33435fad3d
Making bad alias discovery more obvious (temporary)
2014-07-31 15:16:44 -07:00
a0908bf9d8
Minor documentation updates
2014-07-31 13:56:02 -07:00
6048343fee
Enhancing NTFS Stream tests
2014-07-31 10:09:53 -07:00
971e1f0aaa
When test failure occurs, give more details
2014-07-31 08:41:35 -07:00
0dbf684298
Added alias tests to FileSystemResourceTest
2014-07-31 15:22:12 +10:00
252933891c
Merge branch 'master' into pathresource
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
a14b2be0e6
Merge branch 'jetty-http2' into refset
2014-07-31 11:58:30 +10:00
e415de44c6
Eat what you kill strategy avoids double dispatch
2014-07-31 08:58:19 +10:00
489830a0b2
Prototype execution strategy
2014-07-30 18:08:54 +10:00
c13be6d932
Merge branch 'jetty-http2' into refset
...
Conflicts:
jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
30123607c6
Major refactor of metadata and HttpURI
...
This refactor strives to remove duplication between the Metadata class and the HttpURI class.
Both classes have been made mutable (as they partially were anyway so best not to pretend).
HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).
Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
467773dbdf
Merged branch 'master' into 'jetty-http2'.
2014-07-22 21:14:46 +02:00
4daba1ba79
Restored IteratingCallback APIs (in particular the completed()
...
method) to keep compatibility over micro versions of Jetty.
Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.
Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
987800c419
440122 - Remove usages of ForkInvoker.
2014-07-22 16:36:15 +02:00
7f62f2600b
refactored URI handling
2014-07-20 10:23:47 +10:00
fb2a67c0f9
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-19 00:49:37 +10:00
b38a978eac
439067 Improved graceful stop timeout handling
2014-07-19 00:46:55 +10:00
89a816843f
removed refset from hpack
2014-07-18 15:59:41 +10:00
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
c4c8426069
439507 - Possible timing side-channel when comparing MD5-Credentials
...
+ Using correct digestMismatch logic
+ Fixing test cases:
+ No longer reuses / shares directories
+ Is now Windows build/test compatible
+ No longer deleteOnExit() the test data
(let maven clean and/or test init do that)
+ Empty directories are now verified
+ Using server.getURI() instead of URL string manipulation
2014-07-17 17:55:22 -07:00
12b522d796
439507 Avoid timing leak in MD5 compare
...
Also-by: Benny Baumann<BenBE@cacert.org>
2014-07-17 12:42:59 +10:00
64e5c1e0ce
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-17 11:32:27 +10:00
591eedcb59
[FindBugs] Include explicit typing whereever possible
...
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
0c66f3a68e
[FindBugs] Ensure resources are closed/freed properly
...
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
ce63ab2290
Ensure everything is finalized properly, especially that the lock is unlocked
...
The issue here was that due to the method call there was no guarantee that the unlock was reached in case of an exception.
Restructuring the code like this provides this guarantee
2014-07-17 08:51:45 +10:00
5be27516a4
[FindBugs] Remove unnecessary template specialization
2014-07-17 08:31:08 +10:00
4d2a580c2c
439375 preferred rfc7231 format is mime;charset=lowercase-9
2014-07-11 17:56:08 +10:00
5e281dd449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
0c7de2e5bd
438331 - AbstractLogger.debug(String,long) infinite loop
...
+ Breaking infinit loop
2014-07-09 08:54:10 -07:00
ca1a9ceb7c
fixed merge issues
2014-07-04 23:22:40 +10:00
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
7fbf521d4e
438204 correctly wrap IPv6 hostnames in URIs generated by jetty
2014-07-03 10:11:16 +10:00
78b03c5b8e
More debug for intermittent failures
2014-07-02 16:01:00 +10:00
Simone Bordet
Joakim Erdfelt
Jan Bartel
Greg Wilkins
Jesse McConnell
John Myers
Jan Bartel
Greg Wilkins