Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,005 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

990 Commits

Author SHA1 Message Date
Jan Bartel 2a25402de0 444124 JSP include with <servlet><jsp-file> can cause infinite recursion 2014-09-18 18:02:18 +10:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Jesse McConnell c034544ab9 reset for release 2014-09-05 08:10:15 -05:00
Greg Wilkins d8e6331434 442477 Allow Symlink aliases by default 2014-08-27 17:33:27 +10:00
Jesse McConnell c23e5f4889 [maven-release-plugin] prepare for next development iteration 2014-08-21 09:13:38 -05:00
Jesse McConnell 3347e11281 [maven-release-plugin] prepare release jetty-9.2.3.v20140821 2014-08-21 09:13:32 -05: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
Greg Wilkins a14d843382 ignored osgi-spdy tests 2014-08-14 15:18:28 +10:00
Greg Wilkins 98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-distribution/pom.xml
 2014-08-14 08:38:25 +10:00
Greg Wilkins 2af613a28b improved debugging output 2014-08-13 15:56:02 +10:00
Greg Wilkins 17f46665df preencoded httpfield optimisation 2014-08-06 21:09:26 +10:00
Greg Wilkins b5971484a5 Basic push mechanism skeleton 2014-08-06 10:50:55 +10:00
Greg Wilkins eaf374fa58 refactored Dispatcher for new HttpURI 2014-07-25 17:28:35 +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 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
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins 7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins 35ca372e30 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-19 18:56:15 +10:00
Greg Wilkins c72649e150 435653 encode async dispatched requestURI 2014-07-19 18:55:02 +10:00
Greg Wilkins a537fefd6b Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-18 15:28:54 +10:00
Greg Wilkins a2a333ba53 435653 encode async dispatched requestURI 2014-07-17 15:51:22 +10:00
Greg Wilkins 64e5c1e0ce Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-17 11:32:27 +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 937ef10718 [FindBugs] outer if statement alreayd catches max_cached_files 2014-07-17 08:31:08 +10:00
Greg Wilkins 6893027ecd Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
 2014-07-16 17:23:29 +10:00
Jan Bartel 50f11bea09 439663 Allow mappings to be declared before servlet/filter 2014-07-16 15:53:07 +10:00
Greg Wilkins 853e020210 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-16 15:31:48 +10:00
Greg Wilkins 4d2a580c2c 439375 preferred rfc7231 format is mime;charset=lowercase-9 2014-07-11 17:56:08 +10:00
Jan Bartel d5c210f1c3 439390 Ensure jsp scratchdir is created same way for quickstart and non-quickstart 2014-07-11 16:06:40 +10:00
Jan Bartel 644eccab8b 439387 Ensure empty servlet-class never generated for quickstart 2014-07-11 14:16:24 +10:00
Greg Wilkins 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
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Simone Bordet 66f3913527 Merged branch 'origin/master' into 'jetty-http2'. 2014-06-25 12:34:19 +02: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 f93a409589 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-24 17:33:51 +02:00
Jan Bartel fead772b64 437706 ServletTester calls LocalConnector method with hardcoded timeout 2014-06-24 10:43:15 +02:00
Greg Wilkins 0539b48b8a nicer constructors 2014-06-17 15:28:40 +02:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Simone Bordet adaeeefe32 Merged branch 'master' into 'jetty-http2'. 2014-06-16 16:08:40 +02:00
Jan Bartel fb29f56b4d 437051 Refactor Filter chain handling of Request.isAsyncSupported 2014-06-10 16:28:45 +02:00
Jan Bartel 144a460407 436894 GzipFilter code cleanup 2014-06-10 16:28:45 +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 bb4d42f139 Merge remote-tracking branch 'origin' into jetty-http2 2014-06-04 15:09:19 +02:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Greg Wilkins e8fcb90bc2 DefaultServlet uses cached headers 2014-06-04 15:05:34 +02: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
Jesse McConnell 6a3cab2a2f [maven-release-plugin] prepare for next development iteration 2014-05-15 14:44:37 -05:00
Jesse McConnell eec01cbff4 [maven-release-plugin] prepare release jetty-9.2.0.RC0 2014-05-15 14:44:28 -05:00
Jan Bartel fb2010177c 434715 Avoid call to ServletHolder.getServlet() during handle() iff servlet is available and instantiated 2014-05-13 11:21:38 +02:00
Simone Bordet e4d6768901 434386 - Request Dispatcher extracts args and prevents asyncIO. 
Changed behavior of mergeQueryParameters() so that new query
parameters hide old query parameters, but they are accumulated for
getParameter() APIs.
 2014-05-12 13:08:28 +02:00
Simone Bordet ba4ed86e31 434386 - Request Dispatcher extracts args and prevents asyncIO. 
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
 2014-05-12 10:57:13 +02:00
Jan Bartel 8fb9baace1 Change org.eclipse.jetty.servlet.jspPackagePrefix to a context init-param 2014-05-07 15:29:36 +02:00
Jan Bartel 7db7620c36 367680 jsp-file with load-on-startup not precompiled 2014-05-06 21:22:00 +02:00
Greg Wilkins 51c5a4c833 425421 ContainerLifeCycle does not start added beans in started state 2014-05-05 14:53:53 +02:00
Greg Wilkins 1e8d8b8b3e 433572 default to sending date header 2014-04-28 14:50:58 +02:00
Joakim Erdfelt 718017af94 Minor tweak to throwable assertion to be more reliable 2014-04-25 12:36:08 -07:00
Greg Wilkins eade9a3d25 432901 ensure a single onError callback only in pending and unready states 2014-04-25 18:23:54 +02:00
Greg Wilkins 87c5b30d1c 432901 ensure a single onError callback only in pending and unready states 2014-04-25 17:26:43 +02:00
Greg Wilkins 8855b79be5 433431 Support ServletHandler fall through 2014-04-25 12:21:55 +02:00
Simone Bordet d90e6210bb 432777 - Async Write Loses Data with HTTPS Server. 
Fixed by properly flipping the aggregate buffer when copying bytes to it.
 2014-04-17 13:28:17 +02:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00
Greg Wilkins 5c188e02b7 improved AsyncServletTest 2014-03-24 15:11:40 +11:00
Greg Wilkins 0d1fca545c 424107 Abort HttpTransport if already committed on error 2014-03-21 13:51:30 +11:00
Joakim Erdfelt c251d5789d Adding some getRequestURI tests to validate servlet behavior 2014-03-19 11:08:30 -07:00
Greg Wilkins b3be247423 merged quickstart changes 2014-03-14 13:07:00 +11:00
Greg Wilkins af7dd4b99e increase large writes to try to always achieve !isReady 2014-03-13 10:53:00 +11:00
Joakim Erdfelt 0c8bdb650c cleaning up test 2014-03-10 12:31:44 -07:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +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 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
Simone Bordet 5edf2799e9 Made test more robust. 
The response may arrive on client before the server notifies the
complete listeners, so the assert on client side was spuriously
failing to check the completion on server side.
 2014-02-06 11:27:22 +01:00
Greg Wilkins 7725056234 426750 isReady() returns true at EOF 2014-02-05 17:34:22 +11:00
Greg Wilkins a09d05b5cb protected ServletHandler API 2014-01-30 15:52:15 +11: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 a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Jan Bartel 801a33d367 424303 @ServletSecurity not applied on non load-on-startup servlets 2013-12-19 15:23:42 +11:00
Jan Bartel 56b0fedf69 424398 Servlet load-on-startup ordering is not obeyed 2013-12-19 15:02:35 +11:00
Jan Bartel 9e2d0a33d6 424284 Identify conflicts in logging when error "Multiple servlets map to {pathspec}" occurs 2013-12-19 10:05:46 +11:00
Jan Bartel 2d3d912173 423361 Ensure ServletContainerInitializers called before injecting Listeners 2013-12-13 15:03:46 +11:00
Greg Wilkins 1731e0c69a 423392 - GzipFilter without wrapping or blocking 
ensure that servlets are enabled for demo
 2013-12-13 12:19:38 +11:00
Jan Bartel dfe5889bc4 423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation) 2013-12-12 14:44:38 +11:00
Greg Wilkins cd05751ff7 423392 - GzipFilter without wrapping or blocking 
I Added AsyncGzipFilter, which uses a modified HttpOutput instance to provide gzip compression without wrapping or blocking.
Does not currently handle deflate.
 2013-12-06 22:53:41 +11:00
Greg Wilkins 232ca134fc removed debug print from test 2013-12-02 18:49:23 +11:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Greg Wilkins 51e82b4c5c 422807 fragment large written byte arrays to protect from JVM OOM bug 2013-11-29 14:28:07 +11:00
Greg Wilkins 152f3f85f5 422734 messages per second in ConnectorStatistics 2013-11-28 19:10:56 +11:00
Greg Wilkins a67acf16bf changed gzip default to match webdefault.xml 2013-11-25 13:22:35 +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 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 1d5635c76c 420776 complete error pages after startAsync 
handle complete and dispatch calls before the thrown exception

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-11-08 15:08:01 +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
Greg Wilkins 852be79a3c Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-11-01 14:45:16 +11:00
Greg Wilkins 56fcfa45fb 420844 Connection:close on exceptional errors 2013-11-01 13:37:44 +11:00
Greg Wilkins 37ea88d299 fixed bad merge 2013-11-01 08:09:26 +11:00
Greg Wilkins c64dad6066 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-10-31 14:40:54 +11:00
Greg Wilkins 466725e343 420776 complete error pages after startAsync 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-31 14:16:34 +11:00
Greg Wilkins d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-24 15:33:08 +11:00
Greg Wilkins 353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins 55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-10-23 08:00:30 +11:00
Greg Wilkins ffffd3938c fixed merge 2013-10-21 14:56:23 +11:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Greg Wilkins b31466839a 419799 Async timeout dispatches to error page 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-18 14:50:01 +11:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00
Greg Wilkins 33b10efcaa Merge remote-tracking branch 'origin/release-9' 2013-10-14 11:12:31 +11:00
Greg Wilkins 7cb553557e 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 2013-10-04 16:12:53 +10:00
Greg Wilkins 52752ae142 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
 2013-10-04 16:10:47 +10: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
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
Greg Wilkins 43c92f8117 416812 - Don't start WebSocketClient for every context 
turn off for all contexts in demo
 2013-09-12 20:44:13 +10:00
Greg Wilkins c21ce1183e 417023 Add Default404Servlet if no default servlet set 2013-09-12 10:15:19 +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 c3bd5752ee Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-09-06 09:19:45 +10:00
Greg Wilkins ee52769dea 416663 Content-length set by resourcehandler 2013-09-06 09:19:05 +10:00
Greg Wilkins a3f6633385 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-09-05 13:19:12 +10:00
Greg Wilkins 9b9c7ba8d1 416568 Simplified servlet exception logging 2013-09-05 11:04:11 +10:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell ef166c23e6 Merge branch 'release-9' 2013-08-23 18:58:01 -05:00
Joakim Erdfelt b8e1f42b37 414635 Modular start.d and jetty.base property 
+ More mod cleanup
 + Adding cyclic module reference detection and reporting
 2013-08-22 14:21:52 -07:00
Jesse McConnell 450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Simone Bordet 0cdd884672 Merged branch 'master' into 'jetty-9.1'. 2013-08-21 22:20:11 +02:00
Simone Bordet 8951c4c773 Added tests for AsyncContext listeners behaviour. 2013-08-21 22:18:56 +02:00