Commit Graph

1516 Commits

Author SHA1 Message Date
Jan Bartel 8ce96cdd2e 441475 org.eclipse.jetty.server.ResourceCache exceptions under high load 2014-08-27 14:46:22 +10:00
Jan Bartel 75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 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
Simone Bordet 987800c419 440122 - Remove usages of ForkInvoker. 2014-07-22 16:36:15 +02:00
Greg Wilkins b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Joakim Erdfelt 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
Greg Wilkins 12b522d796 439507 Avoid timing leak in MD5 compare
Also-by: Benny Baumann<BenBE@cacert.org>
2014-07-17 12:42:59 +10:00
Greg Wilkins 591eedcb59 [FindBugs] Include explicit typing whereever possible
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins 0c66f3a68e [FindBugs] Ensure resources are closed/freed properly
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins 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
Joakim Erdfelt 5be27516a4 [FindBugs] Remove unnecessary template specialization 2014-07-17 08:31:08 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Joakim Erdfelt 0c7de2e5bd 438331 - AbstractLogger.debug(String,long) infinite loop
+ Breaking infinit loop
2014-07-09 08:54:10 -07:00
Greg Wilkins 7fbf521d4e 438204 correctly wrap IPv6 hostnames in URIs generated by jetty 2014-07-03 10:11:16 +10:00
Greg Wilkins 78b03c5b8e More debug for intermittent failures 2014-07-02 16:01:00 +10:00
Greg Wilkins 9b764ef3fa 435322 Fixed Iterating Callback close 2014-06-27 20:43:12 +02:00
Joakim Erdfelt d49ecdf1d6 Minor tweak for windows testcase expecting IllegalArgumentException 2014-06-26 09:14:04 -07:00
Simone Bordet 02271b29f5 Removed Action.FAILED, since it was never used and cluttered the
implementation. Subclasses should just either throw an exception or
directly call failed(Throwable).
2014-06-26 09:41:15 +02:00
Joakim Erdfelt 39079d4e84 Tweaking for windows test conditions 2014-06-25 15:29:18 -07:00
Greg Wilkins a746d78951 438079 435322 Fixed Iterating Callback fail handling and removed per send instance 2014-06-25 19:20:03 +02:00
Joakim Erdfelt 45a0690ba7 More PathResource updates.
+ Fixing up PathResource.list() per recommendations by @ash2k (on github)
+ Adding PathResource.getAlias() to conform to expectations
2014-06-25 10:07:41 -07:00
Joakim Erdfelt 2a943887b6 437800 - URLs with single quote and spaces return 404
+ Expanded FileResourceTest
+ Added PathResource + PathResourceTest to show java.nio.file
  alternative approach (currently POC)
2014-06-25 06:53:22 -07:00
Simone Bordet 3ff4195dbc Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-06-25 12:26:45 +02:00
Greg Wilkins 31ce7cabda 437800 Improved alias handling of different encodings 2014-06-24 11:32:56 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Greg Wilkins 0d64434b27 435322 Improved debug 2014-06-09 18:35:23 +02:00
Greg Wilkins ac4f8a26b7 435322 Protect blocker against null failed callback 2014-06-04 13:39:58 +02:00
Joakim Erdfelt cfe99742d9 Due to JettyAwareLogger, the Slf4j minimum requirement is version 1.6 2014-06-03 15:34:21 -07:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Joakim Erdfelt bcf52e14f0 435206 - Can't add Cookie header on websocket ClientUpgradeRequest
+ Fixed competing cookie setters between WebSocketClient's use of
  CookieStore and UpgradeRequest.setCookies()
+ Added some utility methods to LazyList (for lack of existence of
  ListUtil or CollectionUtil in jetty-util)
2014-05-20 11:57:35 -07:00
Simone Bordet 7918a58c71 Using Callback.Adapter.INSTANCE to avoid unneeded allocations. 2014-05-19 18:49:17 +02:00
Joakim Erdfelt b515da6456 Import cleanup 2014-05-12 12:47:46 -07:00
Joakim Erdfelt 707e9b5dda 434679 - Log static initialization via jetty-logging.properties fails sometimes
+ More cleanup of Log initialization to better use JDK7 features,
  and to not use other parts of Jetty that might initialize Logging
  itself.  As these are the causes of the bad initialization failures.
2014-05-12 12:43:07 -07:00
Joakim Erdfelt 8e3921b615 Setting up windows-7 specific logging for AnnotatedMaxMessageSize test failure 2014-05-12 10:38:20 -07:00
Greg Wilkins f26291f5b6 433849 FileResource string compare fix 2014-05-06 10:45:10 +02:00
Greg Wilkins 894fb6bfc0 increment Version 2014-05-05 19:09:19 +02:00
Jan Bartel 943fb64176 433841 Resource.newResource() declares an exception it does not throw 2014-05-05 15:45:30 +02:00
Greg Wilkins 51c5a4c833 425421 ContainerLifeCycle does not start added beans in started state 2014-05-05 14:53:53 +02:00
Simone Bordet c4b5e3d3d7 Introduced CompletableCallback to handle asynchronous content on clients. 2014-05-04 23:14:45 +02:00
Greg Wilkins 11096e8a0d Added ASYNC_WOKEN state to HttpChannelState 2014-05-03 10:29:20 +02:00
Greg Wilkins 2e261b75d6 433692 improved buffer resizing 2014-04-29 20:36:13 +02:00
Greg Wilkins bdecc7bd89 433479 Improved resource javadoc 2014-04-25 14:36:59 +02:00
Greg Wilkins 15661722b3 433483 sync log initialize 2014-04-25 14:22:57 +02:00
Greg Wilkins deb7102e0e 404511 removed deprecated StringMap 2014-04-11 10:57:39 +10:00
Greg Wilkins 866960d5d7 431094 Consistent handling of utf8 decoding errors 2014-04-10 15:52:15 +10:00
Greg Wilkins 7adba8d033 431094 Consistent handling of utf8 decoding errors 2014-04-10 15:14:46 +10:00
Greg Wilkins 4dbabd72f2 429734 Implemented the HA ProxyProtocol 2014-04-04 08:47:37 +11:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 28445fc629 Merge remote-tracking branch 'origin/master' into jetty-9-alpn 2014-03-31 09:59:52 +11:00
Greg Wilkins c895f6dbcd organised imports 2014-03-31 09:57:59 +11:00
Joakim Erdfelt 8ebf4367c2 427188 - Re-enable automatic detection of logging-dependencies with logging-module
+ Adding lib/logging/**.jar [lib] to logging.mod
2014-03-28 09:59:16 -07:00
Simone Bordet 342c97d8ba 430654 - closing client connections can hang worker threads.
Prettified usage of NonBlockingThread and added Javadocs.
2014-03-27 15:37:23 +01:00
Simone Bordet 1089a33578 Fixed imports referencing JUnit 3 and old matcher libraries. 2014-03-27 15:34:48 +01:00
Greg Wilkins 86d13b91a5 430654 avoid dispatching failure callbacks 2014-03-27 19:08:16 +11:00
Greg Wilkins 710ea48244 430654 430242 - Closeable SharedBlockingCallback 2014-03-22 09:36:09 +11:00
Greg Wilkins 5d83a43cce 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-22 08:42:03 +11:00
Greg Wilkins 138dfba560 Revert "430242 - added SharedBlockingCallback to support threadsafe blocking"
This reverts commit 9c30e7a303.
2014-03-21 17:55:48 +11:00
Greg Wilkins 367c43a7b3 423982 removed duplicate UrlResource toString 2014-03-21 12:56:53 +11:00
Joakim Erdfelt 18fb0c8877 430824 - jetty-start / use of jetty-logging.xml prevents configuration of ThreadPool in jetty.xml
+ Setting <Configure> to configure itself, not Server
2014-03-20 14:13:29 -07:00
Greg Wilkins 0b1c4b6d8b 426897 improved ContainerLifeCycle javadoc 2014-03-20 12:43:36 +11:00
Greg Wilkins 119718d86f added jetty-quickstart module 2014-03-19 09:56:19 +11:00
Greg Wilkins 9c30e7a303 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-13 21:12:55 +11:00
Greg Wilkins 4de73d508b 430242 - added SharedBlockingCallback to support threadsafe blocking 2014-03-13 14:46:00 +11:00
Jesse McConnell 0ec0d452e9 [maven-release-plugin] prepare for next development iteration 2014-03-07 09:10:08 -06:00
Jesse McConnell 1e555567a9 [maven-release-plugin] prepare release jetty-9.1.3.v20140225 2014-03-07 09:10:08 -06:00
Greg Wilkins 2d8ca94a96 428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered 2014-02-25 11:46:11 +11:00
Greg Wilkins d349d640c0 428859 Do not auto initialise jsr356 websocket if no annotations or EndPoints discovered 2014-02-24 16:31:56 +11:00
Greg Wilkins 15952aeee4 428232 - Rework batch mode / buffering in websocket. 2014-02-21 00:54:32 +11:00
Greg Wilkins 18e19260ff Apply changes resulting from the quickstart project 2014-02-13 12:31:14 +11:00
Jesse McConnell eb0aea46ce set versions.txt file to new version and fix mistaken developmentVersion 2014-02-10 13:48:29 -06:00
Jesse McConnell f3d38dfb15 [maven-release-plugin] prepare for next development iteration 2014-02-10 11:17:14 -06:00
Jesse McConnell 8f6cbc9111 [maven-release-plugin] prepare release jetty-9.1.2.v20140210 2014-02-10 11:17:07 -06:00
Joakim Erdfelt 5cdd27b7b9 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2014-01-13 19:13:32 -07:00
Joakim Erdfelt 1cad68b263 Windows file mod (0755 to 0655) changes 2014-01-13 19:13:19 -07:00
Jesse McConnell 91429ea123 Merge branch 'release-9' 2014-01-10 09:11:25 -06:00
Jesse McConnell b82ec6e668 [maven-release-plugin] prepare for next development iteration 2014-01-08 16:47:09 -06:00
Jesse McConnell b99623a21d [maven-release-plugin] prepare release jetty-9.1.1.v20140108 2014-01-08 16:47:01 -06:00
Joakim Erdfelt 36340c4898 Minor tweaks to leak detector stuff 2014-01-08 14:54:39 -07:00
Simone Bordet 8720fb213c 425043 - Track whether pools are used correctly.
Introduced LeakDetector and utility classes LeakTrackingConnectionPool
and LeakTrackingByteBufferPool to track resource pool leakages.

Fixed ConnectionPool to be more precise in closing connections when
release() cannot recycle the connection.

Fixed a leak in server's HttpConnection in case a request arrives with
the Connection: close header: a ByteBuffer was allocated but never
released.
2014-01-07 19:44:29 +01:00
Joakim Erdfelt 333ac73d5e Cleaning up some New Years leftovers 2014-01-03 08:18:24 -07:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Simone Bordet f73d8a083c 424043 - IteratingCallback Idle race.
Cosmetics, removed TODO.
2013-12-20 11:19:06 +01:00
Greg Wilkins 5643e588e2 424307 obfuscate unicode 2013-12-19 11:01:24 +11:00
Greg Wilkins cf3acd376f 424043 - IteratingCallback Idle race.
restored support for the old style usage where the callback is scheduled externally without a call to iterate()
2013-12-16 11:34:19 +11:00
Simone Bordet 8d621a9331 424043 - IteratingCallback Idle race.
A few renamings and fixes to avoid IllegalStateExceptions.
2013-12-15 23:51:04 +01:00
Simone Bordet 41fc2b8f87 424043 - IteratingCallback Idle race.
Renamed Next enum to Action, and renamed some constant of the State
enum to avoid confusion with the Action enum.

Simplified succeeded() and failed(Throwable) code,
covering also cases not covered before.

Fixed case SCHEDULED in succeeded() that was returning in case the
compareAndSet failed.

Fixed race in perform(), where 2 threads may execute concurrently
after having returned from process().

Vastly improved javadocs and comments.
2013-12-15 00:47:55 +01:00
Greg Wilkins 7141483356 424043 - IteratingCallback Idle race 2013-12-14 09:14:12 +11:00
Greg Wilkins 8243bd60b7 423392 - GzipFilter without wrapping or blocking
Handle the case where a gzip flush requires multiple iterations to go from finish() to finished()
Better handling of exceptional cases
2013-12-09 18:20:04 +11:00
Greg Wilkins 7e7af161bc 419309 - encode alias URIs from File.toURI 2013-11-25 13:08:34 +11:00
Greg Wilkins 0a52c64d16 421697 - IteratingCallback improvements
Use the iteratingcallback for websocket
use gather writes for websocket
always write entire websocket payload
2013-11-21 15:11:56 +11:00
Greg Wilkins 1eb2997efd 421697 - IteratingCallback improvements
avoid wrapping writeCallback
Idle state added to IteratingCallback for SPDY
2013-11-21 14:52:39 +11:00
Joakim Erdfelt 9172d6115b [maven-release-plugin] prepare for next development iteration 2013-11-15 16:58:44 -07:00
Joakim Erdfelt 6feeab6ec3 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:58:36 -07:00
Joakim Erdfelt 7bbc0ff4df [maven-release-plugin] rollback the release of jetty-9.1.0.v20131115 2013-11-15 16:33:52 -07:00
Joakim Erdfelt 1126e68971 [maven-release-plugin] prepare for next development iteration 2013-11-15 16:03:28 -07:00
Joakim Erdfelt d6418c73d4 [maven-release-plugin] prepare release jetty-9.1.0.v20131115 2013-11-15 16:03:20 -07:00
Joakim Erdfelt 6c372b9440 Reverting <version> to 9.1.0-SNAPSHOT 2013-11-15 15:36:26 -07:00
Jesse McConnell b5345caed1 [maven-release-plugin] prepare for next development iteration 2013-11-14 15:27:52 -06:00
Jesse McConnell 1582aa196d [maven-release-plugin] prepare release jetty-9.1.0.v20131114 2013-11-14 15:27:37 -06:00
Greg Wilkins f951b8f979 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	tests/test-webapps/test-jetty-webapp/src/main/webapp/remote.html
2013-11-11 14:08:25 +11:00
Greg Wilkins 16d22828fd 416477 - QueuedThreadPool does not reuse interrupted threads 2013-11-11 14:06:41 +11:00
Greg Wilkins 8bda67b82d Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-11-08 15:24:12 +11:00
Greg Wilkins ed1555e0c4 added QueuedThreadPool.getQueueSize() 2013-11-08 11:58:13 +11:00
Joakim Erdfelt b786fd74d0 Touching up logging.mod 2013-11-06 17:30:49 -07:00
Greg Wilkins 36c807c2f3 417223 - removed deprecated ThreadPool.dispatch 2013-11-04 17:21:50 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Joakim Erdfelt 845c08970e 417933 - logging.mod ini template should include commented log.class settings 2013-10-30 13:14:22 -07:00
Jan Bartel f4e95be443 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-28 18:01:43 +11:00
Mikhail Mazursky c101e55c7f [Bug 420374] Call super.close() in a finally block
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-10-26 12:43:06 +06:00
Greg Wilkins 05cab9bfb4 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
2013-10-26 11:01:25 +11:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Greg Wilkins 28566c72c8 420142 reimplemented graceful shutdown 2013-10-24 17:22:08 +11:00
Greg Wilkins d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Greg Wilkins 323572708c Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
2013-10-23 11:51:19 +11:00
Greg Wilkins d38233c52d 420048 - DefaultServlet alias checks configured resourceBase
Fixed false positive alias detection for ; encoded as %3B in file name
2013-10-23 11:46:58 +11:00
Simone Bordet 61dcf9895e Removed warn logging statement from Adapter.failed(Throwable) since
it just clutter the logs.
2013-10-22 19:18:34 +02:00
Greg Wilkins bb7ab62c7a 419914 - QueuedThreadPool uses nanoTime 2013-10-21 15:12:07 +11:00
Simone Bordet 2d6190da59 Refactored class Fields to a better API. 2013-10-18 13:55:49 +02:00
Simone Bordet 591cf9badf Deleted class org.eclipse.jetty.util.thread.Timeout, replacing its
usages with o.e.j.u.t.Scheduler.
2013-10-17 13:25:15 +02:00
Simone Bordet c1832b29fb Merged branch 'master' into 'jetty-9.1'. 2013-10-17 12:37:37 +02:00
Simone Bordet 7618826349 419687 - HttpClient's query parameters must be case sensitive.
Modified class Fields to take a boolean parameter that defines
whether it is case sensitive or not, and updated HttpRequest to use
a case sensitive Fields instance for the query parameters.
2013-10-17 12:37:01 +02:00
Simone Bordet 4da6ddc94f 403591 - improve the Blocking Q implementation.
Removed ConcurrentArrayBlockingQueue implementations as they were not
 up to par performance wise.
2013-10-17 10:44:39 +02:00
Simone Bordet 6c2a14396e 410840 - Change SSLSession.getPeerCertificateChain() to
SSLSession.getPeerCertificates().
2013-10-16 17:31:40 +02:00
Greg Wilkins 8eb683f9b5 fixed merge 2013-10-14 18:00:53 +11:00
Greg Wilkins 1d5730d8d2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-14 17:19:09 +11:00
Greg Wilkins b8c8abae2e 419333 treat // as an alias in path 2013-10-14 17:16:54 +11:00
Thomas Becker 081e7d3bbd 415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession 2013-10-11 10:51:05 +02:00
Thomas Becker 33dedd15f9 Typo fix 2013-10-11 10:49:13 +02:00
Joakim Erdfelt 646b4c929b Fixing invalid javadoc 2013-10-10 07:31:56 -07:00
Jesse McConnell 856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell 0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05:00
Jan Bartel 0400289826 417561 Refactor annotation related code - make annotation phase able to be multithreaded 2013-09-30 13:27:05 +10:00
Greg Wilkins 0fac295cd8 418014 Handle NTFS canonical exceptions during alias check
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
Greg Wilkins 080781ec0e Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-27 13:37:55 +10:00
Greg Wilkins 458e511ce2 418014 Handle NTFS canonical exceptions during alias check 2013-09-27 13:37:00 +10:00
Greg Wilkins 643b6c3c77 removed ExecutorCallback 2013-09-26 18:06:10 +10:00
Joakim Erdfelt ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Jesse McConnell 0525498ad3 [maven-release-plugin] prepare for next development iteration 2013-09-19 15:06:31 -05:00
Jesse McConnell c05a725db6 [maven-release-plugin] prepare release jetty-9.0.6.v20130919 2013-09-19 15:06:17 -05:00
Jan Bartel d4c035a06f 417561 Refactor annotation related code to remove some deadwood 2013-09-19 15:43:38 +10:00
Greg Wilkins 5a801d398d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-16 12:10:55 +10:00
Greg Wilkins 9fef8215ed 417225 added Container.addEventListener method 2013-09-16 10:48:51 +10:00
Greg Wilkins 070ce9dd22 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky 767faece5c [Bug 415999] Fix some of FindBugs warnings
Mostly not closed streams/DB resources are fixed. But also less
important things.

Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Greg Wilkins ace43502ad refined start.jar mechanism to align with updated documentation 2013-09-06 16:10:03 +10:00
Joakim Erdfelt 8fdc6b05bb Fixing logging.mod for new module format 2013-08-30 13:08:11 -07:00
Simone Bordet cc6e2964be Made Fields.Field constructor public. 2013-08-30 18:45:16 +02:00
Jan Bartel c183c6fad5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:59:50 +10:00
Jan Bartel 280000e88a Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	VERSION.txt
	aggregates/jetty-all/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-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/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-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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/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-server/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/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-loginservice/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-jetty-webapp/src/main/config/demo/webapps/test.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
2013-08-29 12:59:32 +10:00
Greg Wilkins d66778ad06 415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Greg Wilkins d2ff475834 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
	tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
2013-08-23 17:17:34 +10:00
Greg Wilkins b33b5f2f5d 413684 deprecated unsafe alias checkers 2013-08-23 16:49:42 +10:00
Greg Wilkins 59540abeda Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2013-08-22 22:58:58 +10:00
Greg Wilkins c4583918a3 415330 Avoid multiple callbacks at EOF 2013-08-22 21:31:29 +10:00
Greg Wilkins 16191da3ac reduced test times 2013-08-22 21:31:29 +10:00
Greg Wilkins 15f3a4e7c7 reduced test times 2013-08-22 18:17:50 +10:00
Jan Bartel 48ae7ec3f6 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-22 07:56:22 +10:00
David Harrigan e351f04002 bug 415302
Patch to protect against null input's.

-=david=-

Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-08-22 07:47:10 +10:00
Greg Wilkins 669f26566f Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-16 11:44:30 +10:00
Greg Wilkins 2761abb658 415194 Deployer gives management of context to context collection 2013-08-16 11:40:23 +10:00
Greg Wilkins 484aa94cd0 415131 Avoid autoboxing on debug 2013-08-15 22:57:43 +10:00
Jan Bartel c80100b4a9 [maven-release-plugin] prepare for next development iteration 2013-08-15 19:13:27 +10:00
Jan Bartel e7e7e45500 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 19:13:13 +10:00
Jan Bartel 716430bb03 [maven-release-plugin] rollback the release of jetty-9.0.5.v20130815 2013-08-15 18:03:49 +10:00
Jan Bartel 3d13c15d35 [maven-release-plugin] prepare release jetty-9.0.5.v20130815 2013-08-15 17:22:03 +10:00
Jan Bartel 7947b35134 Reset version for rerun of 9.0.5 2013-08-15 16:47:03 +10:00
Joakim Erdfelt 9da23cdba1 Fixing javadoc in jetty-util that JDK 1.7 complains about 2013-08-14 11:05:24 -07:00
Jesse McConnell 4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell 160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Simone Bordet d3a93a0d68 Merged branch 'master' into 'jetty-9.1'. 2013-08-13 16:13:31 +02:00
Thomas Becker 75f87a289a 414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout 2013-08-13 13:35:06 +02:00
Greg Wilkins 1e25778d57 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
2013-08-13 00:44:39 +10:00
Greg Wilkins 43946c62e0 414449 Added HttpParser strict mode for case sensitivity 2013-08-12 23:02:08 +10:00
Jan Bartel 3eeb20f5bd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-12 12:12:50 +10:00
Greg Wilkins c48cb240a1 414763 Added org.eclipse.jetty.util.log.stderr.ESCAPE option 2013-08-12 11:42:09 +10:00
Greg Wilkins e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Greg Wilkins 34cfc3ed10 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-08-09 13:50:49 +10:00
Greg Wilkins a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Joakim Erdfelt 8636c7da45 Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-maven-plugin/pom.xml
	pom.xml
2013-08-05 09:53:48 -07:00
Joakim Erdfelt 74991f90d6 Cleanup from merge 2013-08-05 09:13:32 -07:00
Joakim Erdfelt e2d872fcc7 Merge branch 'jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel 432964cf5f Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
Jan Bartel f3f2bce36c 414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF 2013-08-05 17:18:44 +10:00
Jesse McConnell 20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell 49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell 6ed360c480 reset for release 2013-07-26 11:23:57 -05:00