Commit Graph

3533 Commits

Author SHA1 Message Date
Jesse McConnell 3318b0d116 Merge branch 'master' into release 2012-01-13 08:13:21 -06:00
Simone Bordet c0d3266c59 366472: Javadocs. 2012-01-13 13:23:44 +01:00
Thomas Becker 30dade6b5a 366472: CrossDomainFilter accepts wildcard domains like *.example.com
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-13 11:28:32 +01:00
Simone Bordet cf30b19f7e Added one more SSL bytes tests that send RST while the server is read blocked. 2012-01-13 11:03:03 +01:00
Greg Wilkins 37a040bf6a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-13 14:29:42 +11:00
Greg Wilkins 1db665c3cd Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-13 14:00:01 +11:00
Greg Wilkins 04d703c062 365302: clean up old Logger mbeans 2012-01-13 13:59:49 +11:00
Jan Bartel fc70ea92d7 Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2012-01-13 08:58:55 +11:00
Jan Bartel cd1e2ba88b 368113 Support servlet mapping to "" 2012-01-13 08:58:38 +11:00
Jesse McConnell d79b023d4b add some text 2012-01-12 15:21:46 -06:00
Jesse McConnell bf00fbcf3b nop change 2012-01-12 15:05:38 -06:00
Greg Wilkins c6693a73ad Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-12 23:35:24 +11:00
Greg Wilkins e77b7eace1 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-12 20:42:19 +11:00
Greg Wilkins 564cf7329c 365302: made map of loggers concurrent and shared in abstract 2012-01-12 20:39:24 +11:00
Jan Bartel 3792452c0d Add exception cause to NamingException 2012-01-12 16:41:54 +11:00
Thomas Becker 08f4b79a66 365302: LogMBean added
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-12 12:36:16 +11:00
Greg Wilkins de418bc0e4 368240: updated mbean container to use managed aggregate semantics 2012-01-12 12:25:44 +11:00
Greg Wilkins 9cba806b31 Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2012-01-12 11:01:21 +11:00
Greg Wilkins b8e0258faf Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Jan Bartel 47b7b6db70 368113 Support servlet mapping to "" 2012-01-12 10:33:25 +11:00
Simone Bordet 47930de989 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-11 22:23:07 +01:00
Simone Bordet d4f522b9d4 Corrected SslConnection to clear the _inbound buffer if the input is shutdown
and the unwrapping yielded a buffer underflow.

This is important because isInputShutdown() returns true only if the _inbound
buffer is empty, and the check for the input shutdown is made in several places.

Added also more SSL bytes tests that send RST in order to test cases that throw
exceptions.
2012-01-11 22:22:42 +01:00
Simone Bordet 5c059550a8 Improved logging. 2012-01-11 22:18:24 +01:00
Jesse McConnell 8771d518f1 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-11 11:05:59 -06:00
Jesse McConnell 0dcb3bec9a remove duplicate dependency plugin usage 2012-01-11 11:04:59 -06:00
Thomas Becker f81a8a3d9c 367716: Enhance maxIdleTests for SelectChannelTimeout
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-11 17:07:50 +01:00
Greg Wilkins c5e3ed5afe improved test timing 2012-01-11 16:39:03 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins 1697fcfa5a 368060 do not encode sendRedirect URLs 2012-01-11 12:23:04 +11:00
Greg Wilkins 2d24eb8240 368191: fixed numerical overflow converting seconds to ms 2012-01-11 12:17:26 +11:00
Greg Wilkins d0b81a185c 367638: 361316: protected multipart filter from DoS 2012-01-11 11:51:04 +11:00
Greg Wilkins d66f45f2da 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:16:31 +11:00
Greg Wilkins fc77165877 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-11 11:06:35 +11:00
Greg Wilkins cb22cfdbe5 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:06:14 +11:00
Jan Bartel 2d999a157b 368291 Change warning to info for NoSuchFieldException on BeanELResolver.properties 2012-01-11 11:02:36 +11:00
Jesse McConnell 89136a3945 remove old file 2012-01-10 14:49:42 -06:00
Simone Bordet a42721f321 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-10 20:55:45 +01:00
Jesse McConnell 49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Simone Bordet b6f5edecb5 368240 - Better handling of locally created ThreadPool. Forgot to null out field. 2012-01-10 19:02:48 +01:00
Simone Bordet cecfa69a13 368189 - WebSocketClientFactory should not manage external thread pool.
368240 - Improve AggregateLifeCycle handling of shared lifecycles

Reworked the implementation in order to follow 368240.
2012-01-10 18:10:24 +01:00
Simone Bordet 74317987c4 368240 - Fixed test. 2012-01-10 18:08:10 +01:00
Simone Bordet 3a30b4b7a5 368240 - Better handling of locally created ThreadPool. 2012-01-10 18:05:44 +01:00
Simone Bordet 297625b446 Removed redundant code and cleaned up. 2012-01-10 17:42:52 +01:00
Simone Bordet bb0a320102 Improved toString(). 2012-01-10 17:41:32 +01:00
Simone Bordet ba57d711c6 Cosmetics. 2012-01-10 17:39:17 +01:00
Greg Wilkins 8fcc22df32 368240: Improved handling of dispatch failure 2012-01-11 01:12:36 +11:00
Greg Wilkins a7783ae568 368240: Fixed the start of dependent beans 2012-01-11 01:04:01 +11:00
Greg Wilkins 968a2ac95b 368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector 2012-01-11 00:09:34 +11:00
Jan Bartel 70961bc53b Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 18:23:55 +11:00
Jan Bartel 31bd00ab79 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-10 17:47:46 +11:00