Commit Graph

616 Commits

Author SHA1 Message Date
Simone Bordet fc6ea06106 Fixes #346614 (HttpConnection.handle() spins in case of SSL truncation attacks).
SslSelectChannelEndPoint has been modified to not override shutdownInput() (so behavior is that of the base class, like it should), and when it detects a remote close, it calls SSLEngine.closeInbound(), which throws in case of a truncation attack. The exception is handled and the endpoint closed.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3224 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:52:13 +00:00
Simone Bordet e438787325 Reviewed and cleaned up code for #345615 (Enable SSL Session caching).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3223 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:46:57 +00:00
Joakim Erdfelt 26d59fda32 Javadoc error cleanup.
+ Removing missing class references
+ Fixing empty @return statements
+ Delinking invalid direction class references
+ Correcting @param <name> typos

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3219 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 22:26:41 +00:00
Joakim Erdfelt c70f2d5c68 fixing minor javadoc warning
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3218 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 22:10:55 +00:00
Greg Wilkins fb7b0a3298 javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3213 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 22:18:17 +00:00
Greg Wilkins eb17ca8cbf JETTY-1342 Recreate selector if wakeup throws JVM bug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3212 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:59:02 +00:00
Michael Gorovoy 3b7949bc8c 346181 o.e.j.server.StressTest stalls on MacOS X
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3198 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 02:58:30 +00:00
Jesse McConnell 51f6df9871 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:57:00 +00:00
Jesse McConnell 28e63af76b [maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:56:45 +00:00
Jesse McConnell 0793141d2c [maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:59 +00:00
Jesse McConnell be9da35ef4 set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:39:17 +00:00
Jesse McConnell 898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:41:15 +00:00
Greg Wilkins 53417972ec 346014 Fixed full HttpGenerator
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3161 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 04:31:15 +00:00
Greg Wilkins 018a366f6d 345900 Handle ipv6 with default port
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3160 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 04:18:39 +00:00
Michael Gorovoy 6058e595d5 345873 Update jetty-ssl.xml to new style
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3159 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 04:12:47 +00:00
Michael Gorovoy e5f549664e 345615 SSL Session caching improvements and test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3157 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 22:54:53 +00:00
Michael Gorovoy ab85bcda4f 345615 Enable SSL Session caching
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3145 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-14 01:30:26 +00:00
Greg Wilkins 6a2ecc493e 345704 jetty-nested works with forwarded SSL in cloudfoundry
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3140 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 09:21:47 +00:00
Greg Wilkins ee7333baf7 strangely after the release?
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3138 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 07:28:38 +00:00
Greg Wilkins f8dc394adb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:47 +00:00
Greg Wilkins 6e0649ab3f [maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 04:48:21 +00:00
Jesse McConnell 314a59192d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:57:07 +00:00
Jesse McConnell fadbd0bdc5 [maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins 5d0f1b88f4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins 83b6c19cca [maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Greg Wilkins 5223f6f77c 345543 Always close endpoint on SSLException
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3125 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 08:00:29 +00:00
Greg Wilkins 50ebfdd13b 345290 Weak references from SessionIdManager. HashSessionManager cleanup.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3123 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 02:16:19 +00:00
Michael Gorovoy 70d0d0d1f2 332907 make context name and children context consistent for webapps
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3122 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 15:40:21 +00:00
Greg Wilkins 11de671982 332907 code cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3121 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 07:20:21 +00:00
Michael Gorovoy a28d3bc37a 332907 Add context property to ObjectName of JMX MBeans
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3120 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 04:54:39 +00:00
Greg Wilkins 903d07a230 332907 link structure before adding beans to container
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3118 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-11 01:04:56 +00:00
Greg Wilkins 866255f474 332907 (work in progress) Added AbstractHandlerContainer.findContainerOf
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3105 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 04:57:06 +00:00
Greg Wilkins 540ba7174f 332907 backed out the change until reviewed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3103 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-10 02:29:06 +00:00
Michael Gorovoy 6e197c7ba2 332907 Add context property to ObjectName of JMX MBeans
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3101 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 18:06:31 +00:00
Greg Wilkins 1b26b47caa JETTY-1324 Tested not using CESU-8 instead of UTF-8
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3099 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 07:55:48 +00:00
Greg Wilkins 8d7f52dcde JETTY-1343 IllegalArgumentException for bad % encodings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3096 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 05:16:48 +00:00
Greg Wilkins 9b1f8d3889 343172 Check package implementor for version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3084 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:31:21 +00:00
Greg Wilkins 4cd8b077b5 343482 refactored overlay deployer layout to use WAR layout
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3076 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-05 03:03:12 +00:00
Jan Bartel 3b6dd2778b JETTY-954 WebApp context can now throw optionally throw an error out of doStart(), and the Server doStart() is modified to not catch and log all errors.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3033 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 07:35:59 +00:00
Michael Gorovoy 856e4d7491 343707 'REQUEST' is printed on console for each incoming HTTP request
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3029 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-24 17:29:40 +00:00
Greg Wilkins aa398ad41c 343083 Set nested dispatch type
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3020 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-18 05:37:50 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 58652d8f09 342700 refine websocket API for anticipated changes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3013 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 11:05:35 +00:00
Greg Wilkins 65aa81c018 use port 0 instead of random port
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3011 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-13 01:29:18 +00:00
Greg Wilkins e5bad59c14 minor clean ups and removed debug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2997 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-11 08:18:01 +00:00
Simone Bordet ab86f5d16a Added assert to test weird failure condition.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2993 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 07:57:15 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins dad96688b3 less verbose logging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2989 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 00:50:13 +00:00