Commit Graph

1861 Commits

Author SHA1 Message Date
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Joakim Erdfelt 1925867757 Merge branch 'jetty-9.2.x' 2015-05-22 15:57:02 -07:00
Greg Wilkins c9be4d10fc 468008 Scanner ignores directory length 2015-05-23 08:41:56 +10:00
Greg Wilkins b2e8d2cd04 minor optimisations 2015-05-22 22:53:01 +10:00
Greg Wilkins 61e2177d9e 467730 - HTTP2 requires enabled ciphers to be sorted by blacklist
Fixed removal of COW lists
2015-05-21 02:15:34 +10:00
Greg Wilkins 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
Greg Wilkins bd27e7d2d4 467730 - HTTP2 requires enabled ciphers to be sorted by blacklist 2015-05-21 01:41:12 +10:00
Simone Bordet 1a666e1bd2 Code cleanups. 2015-05-20 16:55:22 +02:00
Greg Wilkins 3f0fd550dc 467702 - SslContextFactory not backward compatible 2015-05-20 22:20:33 +10:00
Joakim Erdfelt eb638777d0 Adding IO.close(Closeable) and using it. 2015-05-14 07:45:25 -07:00
Greg Wilkins f3601267c4 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 11:13:04 +10:00
Greg Wilkins c5e4abd792 467281 Remove Java 1.7 support from Jetty 9.3 2015-05-14 09:31:50 +10:00
Greg Wilkins 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
Greg Wilkins e5fac304b4 467276 NPE protection in SslContextFactory
Also-by: P.Ottlinger<phil@edojo.org>
2015-05-14 08:32:12 +10:00
Greg Wilkins 3e0b95be4f 430951 Support SNI with ExtendedSslContextFactory
made ExtendedSslContextFactory work with non SNI keystore
2015-05-08 12:06:20 +10:00
Greg Wilkins 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
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 96d1e1df6e Fixing javadoc 2015-05-01 15:30:26 -07:00
joakim b87db668c7 Fixing PathWatcher root path handling on Windows 2015-05-01 14:49:45 -07:00
Jan Bartel 9c410f8ad9 466005 Use Files.move(src,trgt) instead of File.rename for Part.write(filename) 2015-05-01 17:43:45 +10:00
Greg Wilkins 4560c5d9e6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-05-01 16:47:10 +10:00
Greg Wilkins 7afede170e less info logging 2015-05-01 16:46:52 +10:00
Jan Bartel aaf7a56a27 466005 Throw exception if rename during Part.write(filename) fails 2015-05-01 16:39:22 +10:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
joakim 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
Jan Bartel 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
Joakim Erdfelt 4b28a5f7fb Disabling PathWatcherTest temporarily 2015-04-29 14:10:57 -07:00
Joakim Erdfelt 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
Greg Wilkins 23216076a9 renamed EatWhatYouKill to ExecuteProduceConsume 2015-04-29 08:44:21 +10:00
Joakim Erdfelt c17f1982be Making updates to FileResource and PathResource for Windows 8.1 2015-04-28 08:28:09 -07:00
Simone Bordet 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
Joakim Erdfelt cf9bd7e663 Removing OSX specific assume 2015-04-24 15:11:33 -07:00
Joakim Erdfelt c4eb2da79c Fixing FileSystem reference techniques for OSX testing on Java 8 2015-04-24 14:44:31 -07:00
Jan Bartel 6ebfd88323 465360 URLResource.addPath should use _useCaches setting to create new Resource 2015-04-24 14:51:29 +10:00
Jan Bartel ff8eeae982 465359 Resource.newResource(String res, boolean useCache) does not use useCache argument 2015-04-24 14:29:56 +10:00
Greg Wilkins e633189b48 457788 Powered By in o.e.j.util.Jetty 2015-04-23 11:07:30 +10:00
Greg Wilkins 6ec2a50cae 430951 Support SNI with ExtendedSslContextFactory
relax cert constraints
2015-04-23 07:24:23 +10:00
Greg Wilkins baede130c0 430951 Support SNI with ExtendedSslContextFactory
exclude certificates with usages
2015-04-22 17:16:41 +10:00
Greg Wilkins 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
Joakim Erdfelt 293da2da2a 464727 - Update Javadoc for Java 8 DocLint
+ Removing @throws ServletException (no longer throws)
2015-04-21 13:59:06 -07:00
Greg Wilkins 21e31d784f 430951 Support SNI with ExtendedSslContextFactory
Use RFC2253 name
2015-04-21 18:50:02 +10:00
Greg Wilkins 2d283edf26 430951 Support SNI with ExtendedSslContextFactory
map lookup of wildcards
use LdapName to parse DN
2015-04-21 18:04:29 +10:00
Greg Wilkins a293967287 464528 NPE protection in getIncludedCipher suites 2015-04-21 17:49:20 +10:00
Greg Wilkins 1a2e625ae8 464724 MultiPartInputStreamParser.parse ServletException never thrown 2015-04-21 15:31:20 +10:00
Greg Wilkins cfb9b3f19b 464744 - PathMap.match() never throws IllegalArgumentException 2015-04-21 15:18:47 +10:00
Greg Wilkins 53fdbd2ec0 430951 Support SNI with ExtendedSslContextFactory
Added support for SAN names
optimised lookup
2015-04-21 14:14:45 +10:00
Joakim Erdfelt 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
Greg Wilkins 6b359b942a 464869 PathResource.addPath allows absolute resolution.
More efficient addPath
2015-04-20 11:50:19 +10:00
Greg Wilkins 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
Greg Wilkins 12a9c0578e 430951 Support SNI with ExtendedSslContextFactory
case insensitive CN
2015-04-20 10:14:40 +10:00
Greg Wilkins ae31162669 430951 Support SNI with ExtendedSslContextFactory
Improved debugging
Regex selection of cn
2015-04-20 10:02:37 +10:00
Joakim Erdfelt 45b82c32a1 464727 - Update Javadoc for Java 8 DocLint
+ Fixed jetty-util's javadoc
2015-04-15 14:38:35 -07:00
Simone Bordet fd158a231b 460671 - Rationalize property names.
Fixed typos.
2015-04-14 22:11:59 +02:00
Simone Bordet 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
Joakim Erdfelt 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
Joakim Erdfelt 645ee9223c Temp revert to make CI happy (but everything else sad) 2015-04-10 06:47:28 -07:00
Joakim Erdfelt d89aa3a866 Fixing compiler source for modules that now require Java 8 2015-04-09 13:32:30 -07:00
Joakim Erdfelt 60d790cbf8 Marking java8 specifics excluded when compiling with java7 2015-04-08 15:10:53 -07:00
Greg Wilkins 5ed2f84d06 430951 Support SNI with ExtendedSslContextFactory 2015-04-02 19:12:44 +11:00
Simone Bordet 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
Greg Wilkins 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
Greg Wilkins fd12bb8c5c fixed java 1.7 import 2015-03-26 13:53:03 +11:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Greg Wilkins 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
Greg Wilkins eca04f401a TreeTrie getBest String implementation 2015-03-26 12:18:06 +11:00
Greg Wilkins 5d14d0ca7a removed extra HttpInput synchronization 2015-03-26 12:18:06 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Simone Bordet 161317a5ef Merged branch 'jetty-9.2.x' into 'master'. 2015-03-23 22:32:40 +01:00
Simone Bordet 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
John Myers 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
John Myers 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
Simone Bordet feed8ea158 Small refactoring of HTTP/2 upgrade code. 2015-03-12 19:08:26 +01:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Joakim Erdfelt 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
Joakim Erdfelt e213c4488e 453834 - CDI Support for WebSocket
+ Updating javadoc
2015-03-12 10:09:30 -07:00
Joakim Erdfelt 8b6a2629f8 453834 - CDI Support for WebSocket 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 5b5c2369d5 Stragglers to the new year. tsk. tsk. 2015-03-12 10:09:30 -07:00
Joakim Erdfelt 0c930c8640 Rename EnhancedInstantiator to DecoratedObjectFactory 2015-03-12 10:06:03 -07:00
Joakim Erdfelt d6911b431f 453834 - CDI Support for WebSocket
+ Attempting to get new socket @Inject working
2015-03-12 10:04:50 -07:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 2b7b5ef495 Rethinking Decorators 2015-03-12 10:04:13 -07:00
Greg Wilkins b7d719be5f 459845 - Support upgrade from http1 to http2
Parse setting frame.
2015-03-13 00:54:33 +11:00
Greg Wilkins 870e0ab0b3 Converted IteratingCallback to use SpinLock 2015-03-11 15:37:25 +11:00
Greg Wilkins 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
Simone Bordet 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
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Simone Bordet b7715fb3eb Merged branch 'jetty-9.2.x' into 'master'. 2015-03-07 23:26:59 +01:00
Simone Bordet a13a55e242 Introduced LeakDetector.id() to be consistent in logging the resource ID. 2015-03-07 22:32:59 +01:00
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Greg Wilkins 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
Greg Wilkins 2c3a4869ab Tagged buffers from MappedByteBufferPool 2015-03-06 11:47:56 +11:00
Joakim Erdfelt 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
Greg Wilkins 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
Greg Wilkins e8b6902b16 SpinLock cleanup of HttpExchange 2015-03-05 18:32:17 +11:00
Simone Bordet 3162ccc299 Fixed dependency on old test helper classes. 2015-03-02 17:00:52 +01:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Joakim Erdfelt 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
Joakim Erdfelt 4df5647f6d 460642 - HttpParser error 400 can expose previous buffer contents in HTTP status reason message 2015-02-23 14:44:53 -07:00
Greg Wilkins 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
Joakim Erdfelt d6de16342f Refining testcase 2015-02-19 15:50:47 -07:00
Joakim Erdfelt bdf5854610 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
2015-02-19 15:02:27 -07:00
Joakim Erdfelt 5ecc9b8a36 Adding some tests to prove out inherited lifecycle listener behavior 2015-02-19 14:43:24 -07:00
Greg Wilkins b60ea47ef4 Revert "Revert "Fixed AsyncIO double dispatch""
This reverts commit 8bd94ec6be.
This is a revert of the revert to add back in the useful debug, plus some TODO comments describing the problems
2015-02-20 00:18:29 +11:00
Greg Wilkins 8bd94ec6be Revert "Fixed AsyncIO double dispatch"
This reverts commit 968063c1ab.
2015-02-20 00:03:40 +11:00
Greg Wilkins 968063c1ab Fixed AsyncIO double dispatch 2015-02-19 18:13:31 +11:00
Greg Wilkins 363d04174d 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
onClose also a Product task
2015-02-19 13:35:58 +11:00
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins e18573f4a3 460211 Fixed Idle race in ExecuteProduceRun
Reimplemented ExecuteProduceRun with a spin lock
2015-02-18 21:47:22 +11:00
Greg Wilkins b78faff1bf improved exception messages during tests 2015-02-18 17:35:43 +11:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Greg Wilkins 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
Greg Wilkins 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
Simone Bordet 465f6f7da8 Merged branch 'jetty-9.2.x' into 'master'. 2015-02-12 14:32:24 +01:00
Simone Bordet 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
Simone Bordet 44d262c65a Renamed GatheringCallback to CountingCallback. 2015-02-10 13:16:41 +01:00
Simone Bordet 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
Simone Bordet 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
Simone Bordet cb5541b58e Merged branch 'jetty-9.2.x' into 'master'. 2015-02-09 17:39:16 +01:00
Simone Bordet 1274bb9e43 Implemented dump() to print out the scheduler thread stack trace. 2015-02-09 12:13:18 +01:00
Simone Bordet 02b5732720 First take at implementing the HttpClientTransport for HTTP2. 2015-02-09 09:11:56 +01:00
Joakim Erdfelt b90c83250e Merge branch 'jetty-9.2.x' 2015-01-30 11:45:40 -07:00
Joakim Erdfelt 56ff29568f 458849 - org.eclipse.jetty.util.Uptime.DefaultImpl() not available on GAE 2015-01-30 11:45:06 -07:00
Joakim Erdfelt 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
Simone Bordet 961a90d16c Merged branch 'jetty-9.2.x' into 'master'. 2015-01-29 14:11:21 +01:00
Simone Bordet 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
Greg Wilkins 5b42345cc6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-01-23 11:43:20 +01:00
Greg Wilkins 7e608a70eb 458209 Length check for HttpMethod MOVE lookahead 2015-01-23 11:04:33 +01:00
Greg Wilkins c5fbb185de 457893 Close temp jar resource 2015-01-22 16:23:54 +01:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Greg Wilkins 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
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Greg Wilkins 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
Greg Wilkins 3270af81e8 456956 Reduce ThreadLocal.remove() weak reference garbage 2015-01-07 19:53:30 +01:00
Simone Bordet 337d638422 Merged branch 'master' into 'jetty-9.3-ewyk'. 2015-01-06 17:32:12 +01:00
Simone Bordet 379f9f6c43 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-06 17:30:43 +01:00
Simone Bordet 3abfbe26b3 Using the provider string when creating the SSLContext in case of no
keystore.
2015-01-06 17:30:03 +01:00
Greg Wilkins 3ad8f627e7 improved javadoc 2015-01-01 17:32:44 +01:00
Greg Wilkins 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
Greg Wilkins 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
Greg Wilkins 20fc880c3e Merge branch 'master' into jetty-9.3-ewyk 2014-12-31 16:29:40 +01:00
Greg Wilkins 58faca9e09 430951 Improved ordering of SSL ciphers 2014-12-31 15:45:08 +01:00
Greg Wilkins fd605248dc Bah humbug 2014-12-25 10:21:20 +01:00
Greg Wilkins fecc03a2f5 fixed some more tests after EWYK refactor 2014-12-23 22:20:49 +01:00
Greg Wilkins 3f59bc4c14 refactored HttpConnector for EWYK - work in progress 2014-12-23 17:15:27 +01:00
Greg Wilkins 2a584613ee work in progress on EWYK HTTP 2014-12-21 20:56:36 +01:00
Greg Wilkins e363dd41c2 HttpConnection refactoring work in progress 2014-12-21 15:23:36 +01:00
Simone Bordet 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
Simone Bordet 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
Greg Wilkins 3b34423b17 EWYK SelectorManager 2014-12-18 17:06:32 +01:00
Greg Wilkins 31e06b5791 refactored jetty-io to not have onFillable statemachine. work in progres... 2014-12-18 14:10:06 +01:00
Greg Wilkins 37e7e5217a updated EWYK strategy 2014-12-17 12:52:17 +01:00
Greg Wilkins f3791a9b06 minor EWYK changes 2014-12-10 13:34:11 +01:00
Greg Wilkins d5feadd241 minor EWYK changes 2014-12-10 13:30:50 +01:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Greg Wilkins 1ff23803f7 453627 Fixed FileSystem test for nanosecond filesystems 2014-12-04 15:02:12 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Simone Bordet 007b7dac1c Merged branch 'jetty-9.2.x' into branch 'master'. 2014-11-27 12:01:02 +01:00
Simone Bordet 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
Joakim Erdfelt 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
Greg Wilkins 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
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Joakim Erdfelt f645b4a399 Merge branch 'jetty-9.2.x' 2014-11-05 11:12:05 -07:00
Greg Wilkins d1ead3dcd6 improved javadoc 2014-11-05 17:53:46 +11:00
Greg Wilkins 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
Greg Wilkins 63d6754ea1 449594 Handle ArrayTrie overflow with false return 2014-11-05 10:32:10 +11:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins 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
Greg Wilkins 8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Greg Wilkins b65aed7d10 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 22:44:18 +11:00
Greg Wilkins 921381eb7c 448156 Fixed INACTIVE race in IteratingCallback
More code cleanups and review
2014-10-22 22:43:24 +11:00
Greg Wilkins 58b56b0cfb fixed bad merge 2014-10-22 16:47:55 +11:00
Greg Wilkins 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
Greg Wilkins 679b8d30f8 448156 Fixed INACTIVE race in IteratingCallback
Additional cleanups of ICB code
2014-10-22 16:40:28 +11:00
Greg Wilkins 4bbd3e9909 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 14:08:52 +11:00
Greg Wilkins 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
Jan Bartel 592265c21f 447627 MultiPart file always created when "filename" set in Content-Disposition 2014-10-22 12:56:59 +11:00
Greg Wilkins ba7f7589cb Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-17 14:31:22 +11:00
Greg Wilkins 8bf6b2c62c 444031 Ensure exceptions do not reduce threadpool below minimum
improved the suppression of warnings
2014-10-17 14:29:40 +11:00
Simone Bordet e25e2e2258 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 19:48:38 +02:00
Simone Bordet 90e9cfc535 447381 - Disable SSLv3 by default.
Excluded by default also SSLv2Hello.
2014-10-16 19:46:33 +02:00
Simone Bordet 6268421dd0 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 18:05:12 +02:00
Simone Bordet aea5070e51 447381 - Disable SSLv3 by default.
Excluded by default SSL, SSLv2 and SSLv3.
2014-10-16 17:53:52 +02:00
Jan Bartel 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
Greg Wilkins 6b489c78b6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-15 11:46:42 +11:00
Greg Wilkins 8a555e669a 444031 Ensure exceptions do not reduce threadpool below minimum 2014-10-15 11:22:53 +11:00
Greg Wilkins 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
Joakim Erdfelt 1f543e9983 System.lineSeparator exists 2014-10-08 11:02:13 -07:00
Jan Bartel 149ee01047 445157 First redeployed servlet leaks WebAppContext 2014-10-01 13:03:39 +10:00
Simone Bordet a8b461fe91 Cosmetics: removed unused imports, cleaned up source code, improved javadocs. 2014-09-26 10:13:16 +02:00
Joakim Erdfelt 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
Simone Bordet ffa0fc73a9 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-23 11:33:16 +02:00
Simone Bordet f02194d405 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-12 12:58:35 +02:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Joakim Erdfelt 2755746def Merge branch 'jetty-http2' 2014-09-11 05:56:55 -07:00
Joakim Erdfelt 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
Greg Wilkins 40d84ff1e3 443662 Consume buffer in write(ByteBuffer) 2014-09-10 17:41:14 +10:00
Greg Wilkins 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
Greg Wilkins c80f556139 Update Password.java
Fixed typo.

Trivial fix from github/pull/21
2014-09-10 10:06:00 +10:00
Jesse McConnell 88b19abf52 [maven-release-plugin] prepare for next development iteration 2014-09-05 09:19:30 -05:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Simone Bordet 3fa302e287 Removed BenchmarkHelper in favour of the version present in the jetty-test-helper. 2014-09-05 15:04:38 +02:00
Greg Wilkins 07ec47adfa improved SSL debug logging 2014-09-04 19:09:39 +10:00
Greg Wilkins 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
Greg Wilkins 610bac49b9 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-04 09:30:21 +10:00
Greg Wilkins ed8abd1d53 443049 Improved HttpParser illegal character messages 2014-09-04 09:27:42 +10:00
Greg Wilkins 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
Greg Wilkins 0a2aeb54a1 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-03 10:46:18 +10:00
Simone Bordet bb1d4946bc Merged branch 'master' into 'jetty-http2'. 2014-09-02 10:25:31 +02:00
Simone Bordet 7be9f0d7a4 Fixed doStop() to call super before interrupting the reference queue thread. 2014-09-01 21:16:40 +02:00
Greg Wilkins 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
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins 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
Greg Wilkins eee2ba206e 435322 Added a idleTimeout to the SharedBlockerCallback 2014-08-29 11:55:06 +10:00
Jan Bartel 0aeebc4ec0 435988 ContainerLifeCycle: beans never stopped on remove 2014-08-27 17:13:07 +10:00
Jan Bartel 8ce96cdd2e 441475 org.eclipse.jetty.server.ResourceCache exceptions under high load 2014-08-27 14:46:22 +10:00
Greg Wilkins 1c71040eca moved config plugin to profile 2014-08-15 19:53:52 +10:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Simone Bordet 015c34d865 Fixed handling of the close state in case it's already closed. 2014-08-06 15:21:33 +02:00
Greg Wilkins aaa2e5c6c1 refined PathResource alias handling 2014-08-02 12:58:24 +10:00