Commit Graph

1858 Commits

Author SHA1 Message Date
Greg Wilkins 41952ebf1d 402075 Dont allocate the parser trie unless needed 2013-03-01 22:16:54 +11:00
Jan Bartel bf154404fe 402048 org.eclipse.jetty.server.ShutdownMonitor thread doesn't stop after the jetty server is stopped 2013-03-01 19:58:44 +11:00
Jan Bartel 90b5ea2c5e Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-03-01 19:08:09 +11:00
Jan Bartel caa0199efe 400312 ServletContextListener.contextInitialized() is not called when added in ServletContainerInitializer.onStartup 2013-03-01 18:09:19 +11:00
Joakim Erdfelt 29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt 2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Greg Wilkins 859710c2c5 401643 Improved Authentication exception messages and provided quiet servlet exception 2013-02-25 13:59:56 +11:00
Greg Wilkins 6d850146fb jetty-9 fixed error from doco change 2013-02-24 09:27:05 +11:00
Greg Wilkins 0671514e34 jetty-9 fixed error from doco change 2013-02-24 09:15:40 +11:00
Greg Wilkins 999db7f4d8 refined jetty embedded examples 2013-02-22 16:19:06 +11:00
Greg Wilkins c302a404cd refined jetty embedded examples 2013-02-22 15:51:17 +11:00
Greg Wilkins b82a781113 400864 Added LowResourcesMonitor 2013-02-18 20:03:36 +11:00
Joakim Erdfelt f15d4c0376 400738 - ResourceHandler doesn't support range requests
+ Adding testcase to replicate issue.
2013-02-13 14:27:26 -07:00
Simone Bordet 6d0f233c80 362854 - Continuation implementations may deadlock.
HttpChannelState was already notifying listeners from outside synchronized blocks,
apart one case, in expired().
Also taken the chance to cleanup the class from warnings.
2013-02-13 16:00:40 +01:00
Simone Bordet ef81982579 400631 - Calling flush() on HttpServletResponse.getOutputStream() after last byte of body causes EofException.
Now flush() is a no-operation if the stream is already closed, consistently with previous Jetty versions.
2013-02-13 12:03:31 +01:00
Jesse McConnell e09d401fd2 add configuration option to not send server version 2013-02-12 10:08:56 -06:00
Joakim Erdfelt 4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell 2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell 5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Jesse McConnell 3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Jesse McConnell a086451bc7 [Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory 2013-01-28 16:15:34 -06:00
Thomas Becker 988206c36a 393968 fix typo in javadoc 2013-01-28 16:11:33 +01:00
Jesse McConnell 2cbb630f8e Merge branch 'jetty-8' 2013-01-25 16:53:46 -06:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell a7c074a86c merge from jetty-8 2013-01-25 15:32:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Greg Wilkins ff350c3740 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-25 11:46:03 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +11:00
Greg Wilkins fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-01-24 14:30:45 +11:00
Greg Wilkins 161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 3a0291929c removed some TODOs 2013-01-11 23:53:26 +11:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins e6d3397c1c jetty-9 removed alias option 2013-01-11 08:50:09 +11:00
Greg Wilkins 25324b666c jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space 2013-01-10 17:31:57 +11:00
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-10 16:24:41 +11:00
Greg Wilkins 3cba027390 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
2013-01-08 09:13:39 +11:00
Greg Wilkins 64ed66db8b Remove test needing java 7 2013-01-08 09:12:08 +11:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
2013-01-07 23:45:38 +11:00
Jan Bartel 96fd7dc562 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-01-07 20:12:49 +11:00
Jan Bartel 3265c334cb 397130 maxFormContentSize set in jetty.xml is ignored 2013-01-07 20:10:54 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Joakim Erdfelt 4037e6111f 395885 - ResourceCache should honor useFileMappedBuffer if set 2013-01-02 14:47:02 -07:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel aa3b829fb1 Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions"
This reverts commit 72cdab4934.
2012-12-24 14:11:15 +11:00
Jan Bartel 37ac5e7b16 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2012-12-22 16:42:33 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
2012-12-22 15:12:17 +11:00
Greg Wilkins d4c4637f4d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-22 12:30:20 +11:00
Greg Wilkins 810ff3802f 397110 Accept %uXXXX encodings in URIs 2012-12-22 12:00:54 +11:00
Jan Bartel 191040b736 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-21 14:00:13 +11:00
Jan Bartel 32e1d0f29c Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-12-21 13:00:14 +11:00
Joakim Erdfelt 5e4711fdb0 Fixing confusing output 2012-12-20 17:32:34 -07:00
Joakim Erdfelt a371a8963d Fixing NPE 2012-12-20 17:30:46 -07:00
Joakim Erdfelt b65973afdd Bug 391623 - Add option to --stop to wait for target jetty to stop
* Reworked ShutdownMonitor to better support multiple servers +
  jetty-maven-plugin requirements.
2012-12-20 15:32:36 -07:00
Joakim Erdfelt 69b9856998 Squashing JMX warnings on jetty startup 2012-12-19 13:50:51 -07:00
Joakim Erdfelt a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07:00
Thomas Becker 72cdab4934 395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions 2012-12-18 13:09:21 +01:00
Greg Wilkins 3ce8c2ba58 jetty-9 recycle response print writers 2012-12-17 16:02:06 +11:00
Jan Bartel 2966192aa4 395794 NullPointerException in when requesting a file without extension 2012-12-17 13:58:39 +11:00
Greg Wilkins c87ebcb4a5 jetty-9 avoid additional dispatch for pipelined requests to optimize pipeline handling 2012-12-17 11:35:26 +11:00
Greg Wilkins ecf7563a79 jetty-9 use direct buffers for generated headers 2012-12-14 14:07:42 +11:00
Jan Bartel f9e76b1620 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
2012-12-14 11:48:55 +11:00
Greg Wilkins 6bfc19be1b jetty-9 optimisation to dispatch before parsing so that handling is done in same thread 2012-12-14 09:50:22 +11:00
Greg Wilkins 5b8a9bb95e jetty-9 use spare space in content buffer for header 2012-12-14 08:30:46 +11:00
Greg Wilkins e5679d42c0 jetty-9 use spare space in content buffer for header 2012-12-14 07:41:22 +11:00
Jan Bartel 08a7cd86e3 Revert "jetty-9 added null constructor" 2012-12-13 20:17:25 +11:00
Greg Wilkins 0c16c774ca jetty-9 use spare space in content buffer for header 2012-12-13 18:49:54 +11:00
Greg Wilkins a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +11:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins f01da31a0a jetty-9 some optimizations 2012-12-08 01:41:01 +11:00
Greg Wilkins 620d051087 jetty-9 recycle content-type 2012-12-08 01:41:01 +11:00
Greg Wilkins 3e151901bf jetty-9 Use public HttpField 2012-12-08 01:41:01 +11:00
Joakim Erdfelt 7abd512b32 391623 - Making --stop with STOP.WAIT perform graceful shutdown
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
  using ShutdownThread to perform a graceful shutdown instead.
2012-12-04 10:18:54 -07:00
Jan Bartel c9db4ca815 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-proxy/pom.xml
	pom.xml
2012-11-30 15:45:36 +11:00
Greg Wilkins 9931ddec94 jetty-9 fixed test webapp TestServer and improved error message 2012-11-29 17:03:40 +11:00
Jan Bartel 9f5801c3fd 395215 Multipart mime with just LF and no CRLF 2012-11-29 15:57:16 +11:00
Greg Wilkins 16844eafc5 jetty-9 javadoc 2012-11-29 13:29:24 +11:00
Greg Wilkins 0805f131a8 jetty-9 added null constructor 2012-11-29 10:10:53 +11:00
Greg Wilkins 9a4e5f3301 jetty-9 Added proxy test webapp. Refined no servlet context handling 2012-11-26 16:57:37 +11:00
Jan Bartel 0eeef6ab4e 393770 Error in ContextHandler.setEventListeners(EventListener[]) 2012-11-26 11:09:21 +11:00
Greg Wilkins f89909e301 jetty-9 cleaning up dependencies 2012-11-23 16:25:57 +11:00
Jan Bartel ba8057867e Merge remote-tracking branch 'origin/jetty-8' 2012-11-23 15:04:20 +11:00
Jan Bartel 8241089364 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-23 14:45:34 +11:00
Jan Bartel 769260f251 392417 Prevent Cookie parsing interpreting unicode chars 2012-11-23 12:29:53 +11:00
Greg Wilkins 7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Greg Wilkins f0cc03ede5 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2012-11-22 17:01:55 +11:00
Greg Wilkins e42b5bf970 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:35:26 +11:00
Jan Bartel 90a86d3a6b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:26:38 +11:00
Greg Wilkins 14162c6154 394514 Preserve URI parameters in sendRedirect 2012-11-22 16:10:19 +11:00
Jan Bartel 8920fcc128 394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session 2012-11-22 15:50:01 +11:00
Greg Wilkins 139de22bc0 394370 correctly handle last content and responses with no content 2012-11-16 12:42:52 +11:00
Greg Wilkins 49de22ea48 jetty-9 improved javadoc 2012-11-15 17:31:43 +11:00
Simone Bordet f35f32ac48 Eliminated jetty-proxy module.
Moved ConnectHandler to jetty-server and ProxyServlet to jetty-servlets.
2012-11-13 17:11:46 +01:00
Simone Bordet ba40f7897d Completed port of ConnectHandler and ProxyServlet implementations. 2012-11-13 15:35:51 +01:00
Greg Wilkins d72feaa941 jetty-9 javadoc improvement 2012-11-13 07:59:53 +11:00
Greg Wilkins 650ce2be66 jetty-9 javadoc improvement 2012-11-13 07:30:49 +11:00
Simone Bordet cf4c5e6024 Added getter for the request buffer; this is needed by the ConnectHandler
to transfer pipelined requests that are present after the CONNECT.

Modified the logic to make the generator persistent to take in account
also the method: if it's a CONNECT, then the generator is always persistent.
2012-11-12 19:07:36 +01:00
Greg Wilkins 9ab2a96715 removed incorrect log.info from listener initialiser 2012-11-12 13:05:06 +11:00
Greg Wilkins 8ff291d223 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
2012-11-12 12:30:26 +11:00
Greg Wilkins 3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins 75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +11:00
Greg Wilkins a1d0efc2bb 393832 start connectors last 2012-11-08 19:30:58 +11:00
Greg Wilkins f336511f87 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
2012-11-08 14:58:10 +11:00
Greg Wilkins b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins e615504889 392492 expect headers only examined for requests>=HTTP/1.1 2012-11-08 14:37:07 +11:00
Jan Bartel 8e47864bcf 392850 ContextLoaderListener not called in 9.0.0.M1 and M2 2012-11-08 14:02:35 +11:00
Jesse McConnell bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell 1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell 70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell 017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jan Bartel 2acdf9f839 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java
	jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
2012-11-05 17:27:49 +11:00
Jan Bartel f3af8c8650 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-05 16:28:25 +11:00
Jan Bartel fff825a997 393494 HashSessionManager can't delete unrestorable sessions on Windows 2012-11-05 16:26:20 +11:00
Jan Bartel 2a2215cf0b Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-11-02 16:59:11 +11:00
Greg Wilkins 52464a5ba6 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins 8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins 65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jan Bartel c49563244c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2012-10-30 19:18:20 +11:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Jan Bartel b8d6b4da8b Making session tests work; incorporating renewing session id keeping old object. 2012-10-27 18:44:35 +11:00
Jan Bartel 1ee6fe4cba Change session renewal to be in line with servlet3.1; make session tests work; fix mongo session manager (scavenging) 2012-10-27 17:38:43 +11:00
Jan Bartel b496962a4a SERVLET_SPEC-27 2012-10-27 17:38:43 +11:00
Jan Bartel 276fea25b8 Add comments 2012-10-27 17:38:43 +11:00
Jan Bartel 958d0c6949 Start incorporating (EDR version) servlet 3.1 spec 2012-10-27 17:38:43 +11:00
Greg Wilkins 7d93f4b228 392237 more debug 2012-10-26 15:31:19 +11:00
Greg Wilkins 63f2db2242 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
2012-10-26 09:43:05 +11:00
Jan Bartel e93aa7d42c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-26 09:39:53 +11:00
Jan Bartel 8a9d25a48b 392641 JDBC Sessions not scavenged if expired during downtime 2012-10-26 09:26:40 +11:00
Greg Wilkins c51cabccc1 392237 moved HttpTransport towards asynchronous solution 2012-10-25 23:28:32 +11:00
Greg Wilkins bf7a0ace22 392237 Added BlockingCallback optimisation 2012-10-25 22:36:13 +11:00
Greg Wilkins 18f7293efd 392237 Fixed 3.0 port of chat servlet 2012-10-25 12:27:30 +11:00
Greg Wilkins ce46d39eb0 392237 javadoc 2012-10-22 15:17:18 +11:00
Greg Wilkins be3432ad55 392237 removed server dependency on contination. All Continuations are now Servlet3Continuations or FauxContinuations 2012-10-21 16:19:40 +11:00
Thomas Becker 8c3642754e 392470: Fix problem in suspend, expire cycle when HttpChannel.run() is called multiple times (happens for SPDY). Add test cases. Remove unused argument from HttpHandler.messageComplete() interface and it's implementations. 2012-10-19 18:17:29 +02:00
Greg Wilkins 2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00
Greg Wilkins 11fb3fa91e Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
2012-10-19 07:43:00 +11:00
Greg Wilkins b618ce59e3 392304 fixed intermittent client SSL failure. Correctly compact in flip2fill 2012-10-18 19:55:57 +11:00
Jan Bartel 0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Jan Bartel f6c1ade82f Refactor AbstractSession to remove _jdbcAttributes 2012-10-18 14:40:22 +11:00
Greg Wilkins 9e2b75314e jetty-9 syntax sugar 2012-10-18 08:19:13 +11:00
Thomas Becker dd651b0d9f Expose more stuff via jmx like threadpool details, connector details, etc.
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
Greg Wilkins 9d62229dec Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/ClientCertAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/DeferredAuthentication.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SessionAuthentication.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/SpnegoAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
2012-10-15 12:15:44 +11:00
Greg Wilkins fac580c374 Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
	VERSION.txt
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
	jetty-annotations/pom.xml
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
	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-http/src/main/java/org/eclipse/jetty/http/Generator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
	jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/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-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
	jetty-osgi/jetty-osgi-httpservice/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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
	jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
	jetty-server/src/test/resources/jetty-logging.properties
	jetty-servlet/pom.xml
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
	jetty-servlets/pom.xml
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	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-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/pom.xml
	jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
	jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/pom.xml
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
	jetty-websocket/pom.xml
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	test-jetty-webapp/src/main/webapp/WEB-INF/web.xml
	tests/pom.xml
	tests/test-integration/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-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-10-12 21:19:21 +11:00
Jan Bartel 785e06d347 390108 Servlet 3.0 API for programmatic login doesn't appear to work 2012-10-12 19:00:28 +11:00
Jan Bartel 7625f0b8b3 Merge remote-tracking branch 'origin/master' into jetty-8 2012-10-11 16:34:16 +11:00
Greg Wilkins 8c3fa91b26 jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added 2012-10-11 16:15:57 +11:00
Joakim Erdfelt f2595a7ec3 Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages. 2012-10-10 09:10:51 -07:00
Jesse McConnell f26b792782 [Bug 391483] fix bad javadoc example in shutdown handler 2012-10-09 15:23:01 -05:00
Greg Wilkins b1c50180b9 jetty-9 some better names 2012-10-09 09:09:04 +11:00
Simone Bordet 2748a9381e jetty-9: Added support for connect timeout. 2012-10-08 11:05:26 +02:00
Greg Wilkins f4d12412eb jetty-9 added FilterConnectionFactory and made SpdyServer use it 2012-10-08 15:22:49 +11:00
Jan Bartel 31807b7892 391188 Files written with Request.getPart().write(filename) should not be auto-deleted 2012-10-08 11:09:41 +11:00
Jan Bartel 36a2ed10be 391080 Multipart temp files can be left on disk from Request.getPart and getParts 2012-10-04 18:31:09 +10:00
Jan Bartel 25cdef966c 391080 Multipart temp files can be left on disk with MultiPartFilter 2012-10-04 15:24:23 +10:00
Greg Wilkins b18a5b05dc jetty-9 fixed double onFillable after 101 upgrade 2012-10-03 10:12:08 -07:00
Greg Wilkins e1b7b4f101 jetty-9 fixed broken websocket from prir optimisations of HTTP dispatch 2012-10-02 18:01:23 -07:00
Greg Wilkins 6cc0734a1a jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback 2012-10-02 13:48:51 -07:00
Hugues Malphettes 1cfa277c6c jetty-9 osgi support 2012-09-24 13:04:57 +08:00
Greg Wilkins 96dc4fe150 jetty-9 improved exception logging 2012-09-24 13:10:36 +10:00
Simone Bordet 9e7fcf4fee jetty-9: Fixed SslBytesServerTest, and added factory methods to relevant classes. 2012-09-21 16:47:01 +02:00
Simone Bordet 2e02f153ce jetty-9: Cosmetics. 2012-09-21 15:10:40 +02:00
Simone Bordet 6a66d1dd7e jetty-9: added license headers. 2012-09-21 11:44:30 +02:00
Greg Wilkins 950249932d jetty-9 improved mbean names 2012-09-21 18:00:46 +10:00
Greg Wilkins 9ee8ef7423 jetty-9 more lifecycle fixes 2012-09-21 18:00:46 +10:00
Simone Bordet f5af05f0cc jetty-9: added license headers. 2012-09-21 09:19:42 +02:00
Greg Wilkins 879cdf4b82 jetty-9 further lifecycle improvements 2012-09-21 16:17:00 +10:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Simone Bordet a0de190367 Merge branch 'jetty-9' into jetty-9-open-close 2012-09-20 19:36:34 +02:00
Simone Bordet be865fa191 jetty-9: reverted JUnit to 4.8.1; trying to upgrade it breaks the whole build. 2012-09-20 19:09:33 +02:00
Simone Bordet 37a7e5977d Merged branch 'jetty-9' into jetty-9-open-close. 2012-09-20 18:46:16 +02:00
Simone Bordet ebdab22a63 jetty-9 - Cleanup. 2012-09-20 18:44:12 +02:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Simone Bordet df699cde27 jetty-9 - Cleanup and JDK7-ification. 2012-09-20 17:48:05 +02:00
Greg Wilkins 0d2627b6e9 jetty-9 improved onOpen onclose handling 2012-09-20 11:05:20 +10:00
Simone Bordet 851de69d9d jetty-9 - Third take at open/close refactoring. 2012-09-19 18:04:15 +02:00
Simone Bordet 44b3bb067c jetty-9 - Second take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet f257f4b2bb jetty-9 - First take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet 1f99d9dd64 jetty-9 - Cleaned up test that was still using JUnit 3.x. 2012-09-19 13:27:48 +02:00
Greg Wilkins f1d5fd1f9d jetty-9 rename ServerConnectorManager 2012-09-18 17:13:24 +10:00
Simone Bordet bc35807525 jetty-9 - Fixed test. 2012-09-17 16:21:53 +02:00
Simone Bordet 89852e0bc8 jetty-9 - Removed dead code. 2012-09-17 16:21:32 +02:00
Greg Wilkins fc49783275 jetty-9 improved test 2012-09-17 17:42:55 +10:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Joakim Erdfelt 44b963e7b8 Fixing typo 2012-09-13 10:17:30 -07:00
Greg Wilkins 9940796a32 jetty-9 xml configurations 2012-09-13 14:43:03 +10:00
Jan Bartel e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel 0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Greg Wilkins c709981aa5 jetty-9 finished refactor for oneconnector and configuration pluggability 2012-09-13 10:00:44 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 62322beaa9 merge from master 2012-09-10 13:14:24 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Simone Bordet 18539cd903 Reverted log call at info level back to debug level. 2012-09-10 18:05:18 +02:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Greg Wilkins a15d71932f jetty-9 protection from double onFillable calls 2012-09-09 08:31:31 +10:00
Greg Wilkins 2bb425d0b2 jetty-9 improved buffer recycling 2012-09-09 07:42:03 +10:00
Simone Bordet 1c306ad89c Jetty9 - Removed code duplication for calculating the jetty version. 2012-09-06 09:16:34 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Jan Bartel 29b4418876 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-06 16:25:24 +10:00
Jan Bartel 605df36577 Add changeSessionId() method in preparation for servlet-3.1 2012-09-06 16:23:46 +10:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Greg Wilkins 3acf2e65ed jetty-9 moved servlet dependencies out of jetty-http 2012-09-06 09:13:17 +10:00
Greg Wilkins 0b3865d749 jetty-9 removed unused schedulers 2012-09-06 09:12:31 +10:00
Simone Bordet b18ab0e76a Jetty9 - First take at HTTP client implementation. 2012-09-04 19:20:29 +02:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins fd01a1b496 JETTY-1541 fixed different behaviour for single byte writes 2012-09-03 17:57:37 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins a922d44ce0 388652 Do not flush on handle return if request is suspended 2012-09-03 13:48:17 +10:00
Thomas Becker 842f30fb87 Additional test to make sure that jetty sends a 500 response code when an exception is thrown. 2012-08-31 15:23:47 +02:00
Greg Wilkins c3844a43c9 388502 handle earlyEOF with 500 2012-08-31 19:00:42 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Thomas Becker b710701d13 HttpServerTestBase small assertion text fix 2012-08-30 16:38:43 +02:00
Thomas Becker f10729c3f8 HttpServerTestBase small assertion text fix 2012-08-30 16:13:27 +02:00
Jesse McConnell 3a0e9e1733 Merge branch 'master' into jetty-8 2012-08-30 09:09:44 -05:00
Jan Bartel c7b9081a52 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-30 16:16:44 +10:00
Simone Bordet 8920cd16b6 Jetty9 - Ported the HTTP SPDY Proxy code. 2012-08-29 18:12:28 +02:00
Simone Bordet 4180db6fae Jetty9 - Removed unnecessary _server field. 2012-08-29 18:09:18 +02:00
Thomas Becker 8fbe6c59d5 jetty-9 merge 2012-08-29 17:27:26 +02:00
Thomas Becker fe88df1def jetty-9 move SimpleHttpParser and SimpleHttpResponse to jetty-test-helper 2012-08-29 15:53:51 +02:00
Simone Bordet 1191f5ab5d Jetty9 - Added copyright header. 2012-08-28 21:57:09 +02:00
Simone Bordet d84eee0b46 Jetty9 - Reverted AbstractConnector to use MappedByteBufferPool, as ArrayByteBufferPool is leaking buffers. 2012-08-28 18:14:22 +02:00
Thomas Becker 3c952da6ed Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-08-28 13:58:05 +02:00
Simone Bordet 7bbd9675cc Jetty9 - Fixed test making it more reliable. 2012-08-28 12:48:37 +02:00
Simone Bordet 34ee7101cc Jetty9 - Added calls to notify() also when calling shutdown() and earlyEOF(), to wake up threads waiting in blockForContent().
Also improved the blockForContent() loop condition, to exit when a shutdown or earlyEOF happens.
2012-08-28 09:31:30 +02:00
Simone Bordet 0acf2f9650 Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput. 2012-08-28 09:29:08 +02:00
Jesse McConnell cf1337264b [Bug 388073] null session id from cookie causes NPE fixed 2012-08-27 11:32:12 -05:00
Simone Bordet 5e4a2508b1 Jetty9 - Removed System.err.println(). 2012-08-27 17:34:46 +02:00
Simone Bordet c2095d7170 Jetty9 - Moved wiring of SslConnection out of HttpServerConnectionFactory.
The wiring of SslConnection in HttpServerConnectionFactory was not the
right place because a ConnectionFactory should just create the Connection
instances, not also wiring them up.
It is responsibility of the connector to wire the SslConnection in.
Moving the wiring outside HttpServerConnectionFactory fixed also a few
SPDY tests, where the wiring was already done outside (and therefore
was done twice).
2012-08-27 17:07:00 +02:00
Thomas Becker 77c03ad45f 388079: AbstractHttpConnection. Flush the buffer before shutting output down on error condition 2012-08-27 12:02:50 +02:00
Greg Wilkins 9a1a020f0e jetty-9 renamed HttpTransport.{commit|write} to send 2012-08-27 14:43:29 +10:00
Greg Wilkins d8b287134f jetty-9 improved range request processing and tests 2012-08-27 12:17:40 +10:00
Greg Wilkins 353978726b jetty-9 reverted isHead change 2012-08-27 11:14:19 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Simone Bordet c743bf4081 Jetty9 - Using the correct length when copying bytes, otherwise BufferUnderflowExceptions are thrown. 2012-08-25 10:43:39 +02:00
Simone Bordet cda0528625 Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do. 2012-08-24 19:36:10 +02:00
Greg Wilkins 1d654a08cf jetty-9 restructured graceful shutdown 2012-08-24 20:16:23 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Greg Wilkins e92006390e jetty-9 avoid SSL close issues with bad request responses 2012-08-24 18:06:32 +10:00
Greg Wilkins 112ee65dcc jetty-9 improved SSL shutdown input 2012-08-24 17:58:52 +10:00
Greg Wilkins c707ba11d1 jetty-9 improved SSL shutdown input 2012-08-24 17:56:22 +10:00
Greg Wilkins fac03a306b jetty-9 more server test fixes 2012-08-24 16:53:36 +10:00
Greg Wilkins 42f998fa1a jetty-9 fixed RFC2616 tests 2012-08-24 10:13:53 +10:00
Jesse McConnell fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Simone Bordet 8c9d4089ed Jetty9 - Fixed and cleaned up tests to make them pass. 2012-08-23 20:36:54 +02:00
Thomas Becker 9173751438 387919: throw EOFException on early eof from client on http requests 2012-08-23 19:36:49 +02:00
Simone Bordet 5672a31432 Jetty9 - Fixed tests. 2012-08-23 18:37:55 +02:00
Simone Bordet 90029a14eb Jetty9 - Added and used shortcut method getByteBufferPool() in place of getConnector().getByteBufferPool(), also used by tests. 2012-08-23 18:36:28 +02:00
Simone Bordet c009cef661 Jetty9 - Improved tests to make them pass. 2012-08-23 18:05:43 +02:00
Simone Bordet 7a5997df9d Jetty9 - Fixed a couple of tests (bad copy/paste) and ignored 2 tests due to pending considerations about how to properly handle 100-Continue. 2012-08-23 17:18:29 +02:00
Simone Bordet f118c77f90 Jetty9 - Resetting the commit status when sending 1xx responses. 2012-08-23 17:17:13 +02:00
Simone Bordet f48f98b4d4 Jetty9 - Improved tests. 2012-08-23 16:10:58 +02:00
Simone Bordet 1ecc3c19f2 Jetty9 - Calling response.sendError() in case of application exceptions only if not committed already. 2012-08-23 16:10:35 +02:00
Simone Bordet 3b9baad1f0 Jetty9 - Improved exception message. 2012-08-23 16:09:10 +02:00
Simone Bordet 85ffa8807e Jetty9 - Cleaned up and fixed the failing tests. 2012-08-23 15:09:09 +02:00
Simone Bordet e74a5cd105 Jetty9 - Remembering the content written also in case of aggregation. 2012-08-23 15:08:36 +02:00
Simone Bordet f4fd02975d Jetty9 - The output type should be set _after_ calling setCharacterEncoding(). 2012-08-23 14:51:54 +02:00
Greg Wilkins c50e7ff742 jetty-9 moved connection:close handling to HttpChannelOverHttp 2012-08-23 19:58:42 +10:00
Greg Wilkins aaa7bf08b6 jetty-9 handle generator IOErrors 2012-08-23 18:32:34 +10:00
Greg Wilkins d59a47d376 jetty-9 simplified error handling 2012-08-23 17:32:10 +10:00
Greg Wilkins cd719bf979 jetty-9 cleanups and fixes after refactor 2012-08-23 14:07:10 +10:00
Greg Wilkins 74e632cd34 jetty-9 fixed some test fails after refactor 2012-08-23 08:39:05 +10:00
Simone Bordet ab5c8ee508 Jetty9 - More work on parser reentrancy, but more work needed. 2012-08-22 16:46:52 +02:00
Simone Bordet c6094c2398 Jetty9 - Small cleanups. 2012-08-22 11:58:21 +02:00
Simone Bordet 783a296bc5 Jetty9 - Removed redundant field and cleaned up code. 2012-08-22 10:29:41 +02:00
Simone Bordet fa06ae9762 Jetty9 - Removed old code not used anymore, greatly simplifying the implementation. 2012-08-22 09:39:03 +02:00
Simone Bordet 71e7f519c7 Jetty9 - Refactored error handling logic. 2012-08-21 23:40:08 +02:00
Simone Bordet dc140f85b7 Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection. 2012-08-21 15:09:54 +02:00
Simone Bordet 21494f97bb Jetty9 - Refactored commit logic into HttpChannel. 2012-08-20 18:32:41 +02:00
Greg Wilkins df5e09df71 removed debugging 2012-08-20 23:32:26 +10:00
Greg Wilkins 325bfc290d jetty-9 work in progress on moving aggregation out of HttpChannel 2012-08-20 20:43:10 +10:00
Greg Wilkins 9080882900 jetty-9 do not recyle Response Writers 2012-08-20 20:35:15 +10:00
Thomas Becker 593209529b jetty-9 make TestHttpResponse inner class of SimpleHttpParser 2012-08-20 10:40:49 +02:00
Jan Bartel e0276a8f65 JETTY-1515 Include cookies on 304 responses from DefaultServlet. 2012-08-20 14:52:33 +10:00
Greg Wilkins 570bf6c580 jetty-9 added some @Overrides 2012-08-20 10:49:41 +10:00
Greg Wilkins 70b2a3f88e jetty-9 cleaned up and unit test for ContextHandler lifecycle 2012-08-20 10:45:33 +10:00
Greg Wilkins 1d89bef7a2 jetty-9 fixed context restart for constraint test 2012-08-20 10:21:07 +10:00
Greg Wilkins 4ff7ae6106 jetty-9 removed redirect race from form auth 2012-08-20 09:22:03 +10:00
Greg Wilkins 2900b4df02 jetty-9 some post merge fixes 2012-08-18 10:37:09 +10:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Thomas Becker ce6820b67b jetty-9: extract common stuff from HttpManyWaysToCommitTest and HttpManyWaysToAsyncCommitTest into abstract class 2012-08-17 21:29:13 +02:00
Thomas Becker 095a15f9e8 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 17:35:33 +02:00
Thomas Becker be73cf1972 jetty-9: HttpManyWaysToAsyncCommitTest added 2012-08-17 17:34:53 +02:00
Greg Wilkins 086e74bed8 jetty-9 merged jetty-8
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
Greg Wilkins 7c94fd5f3c jetty-9 removed HttpParser.isPersistent 2012-08-17 22:06:55 +10:00
Thomas Becker b0537707e3 jetty-9: Small HttpManyWaysToCommitTest fixes 2012-08-17 12:45:55 +02:00
Greg Wilkins e7cad67ace jetty-9 moved more fields out of HttpChannel 2012-08-17 16:41:53 +10:00
Greg Wilkins 78a529fc9d jetty-9 moved more fields out of HttpChannel 2012-08-17 16:32:36 +10:00
Greg Wilkins 2a66567a5b jetty-9 improved handling of half close 2012-08-17 15:34:53 +10:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Thomas Becker f8950b64bd merge with jetty-9 2012-08-16 09:56:51 +02:00
Thomas Becker aa22952368 interims commit 2012-08-16 09:47:33 +02:00
Greg Wilkins 6d2da78aac jetty-9 more commit fixes 2012-08-16 15:25:08 +10:00
Greg Wilkins ff76201050 jetty-9 setContentLength smaller than content written is an IllegalArgumentException 2012-08-16 14:00:14 +10:00
Greg Wilkins 4907498886 jetty-9 added Commit tests and some fixes 2012-08-16 13:27:23 +10:00
Greg Wilkins ed76d97049 jetty-9 added commit test from tbecker. Fixed issue in HttpConnection, started commenting other tests that need some changes 2012-08-16 09:02:34 +10:00
Jesse McConnell c6805c3059 smoke remaining mbean files 2012-08-15 14:22:36 -05:00
Jesse McConnell 5c3a1cfe8c removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations 2012-08-14 16:52:17 -05:00
Jesse McConnell aae7c4da68 removed managed=true from ManagedOperation and ManagedAttribute 2012-08-13 17:19:59 -05:00
Jesse McConnell 11dbce81c8 wire up way to remove the need for managed=true on ManagedAttribute 2012-08-13 16:48:52 -05:00
Jesse McConnell efce7e8421 more mbean -> annotation conversion 2012-08-13 12:41:02 -05:00
Jesse McConnell 51eac5ddf7 more mbean -> annotation conversion 2012-08-13 11:56:25 -05:00
Jesse McConnell 9f4375d1e5 add typing to context handler mbean and remove import from xmlconfiguration 2012-08-13 07:10:07 -05:00
Simone Bordet 279f24faaa Jetty9 - Removed duplicate logger definitions. 2012-08-13 11:48:32 +02:00
Simone Bordet 360bdfa051 Jetty9 - Code cleanups: using generics, diamond operator, removed warnings, etc. 2012-08-13 11:46:09 +02:00
Greg Wilkins c84b496330 jetty-9 more work on stop/close. Turned on statistics all of the time, but still not enough. more work needed. 2012-08-12 11:24:24 +10:00
Jesse McConnell 01f4bb2623 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-11 11:40:48 -05:00
Jesse McConnell 86daeab0ca Remove Managed annotation and convert the context handler over to the new usage 2012-08-11 11:40:32 -05:00
Greg Wilkins 488f53f8d6 jetty-9 cleaned up the stop and stopTimeout handlng 2012-08-11 12:51:32 +10:00
Joakim Erdfelt b8de9a35a4 [multimap-ng] moving UrlEncoded over and fixing various other failing tests 2012-08-10 14:42:35 -07:00
Joakim Erdfelt dfebb117b7 [multimap-ng] step 2, make MultiMap a generic, and remove LazyList use 2012-08-10 12:46:30 -07:00
Joakim Erdfelt 74490580da Merge branch 'jetty-9' into multimap-ng 2012-08-10 11:32:42 -07:00
Joakim Erdfelt da0e5a1ef6 [multimap-ng] step 1, make MultiMap participate as a full fledged member of the Collections framework 2012-08-10 10:25:10 -07:00
Simone Bordet c3dfd0c653 Jetty9 - Set stopTimeout to zero by default, and setting defaults for threaded component that need a non-zero stop timeout to stop properly. 2012-08-10 19:02:16 +02:00
Simone Bordet 136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Greg Wilkins 54ea5a7de2 jetty-9 better dispatching of events to SSL 2012-08-10 14:39:51 +10:00
Thomas Becker 731eb31c7e interims changes 2012-08-09 18:54:41 +02:00
Greg Wilkins 03ebcc881c jetty-9 include more modules 2012-08-09 19:31:50 +10:00
Simone Bordet 0ddbdda280 Jetty9 - Test code cleanup. 2012-08-08 15:02:11 +02:00
Simone Bordet c7a3409ed1 Jetty9 - Shutting down output *and* closing the connection in case the generator produces SHUTDOWN_OUT. 2012-08-08 13:40:42 +02:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00