Commit Graph

2074 Commits

Author SHA1 Message Date
Jesse McConnell ba34537bc4 update jetty-test-helper to 1.6
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3383 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-10 13:16:10 +00:00
Greg Wilkins e55c21ca5c 347898 Close channel on JVM exceptions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3374 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 11:32:13 +00:00
Hugues Malphettes 71ce6291d2 bug 347889
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3372 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 09:01:20 +00:00
Hugues Malphettes c084756951 clean up the redirection.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3371 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 08:59:32 +00:00
Greg Wilkins af2050147c JETTY-1342 recreate selector in change task
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3365 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-01 01:18:58 +00:00
Greg Wilkins 4840dbf39f 347717 start.jar destroys dependent child of --exec
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3359 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-31 03:39:42 +00:00
Hugues Malphettes 183417af1c fix the regressions introduced by the support for dynamically installing bundles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3357 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-31 02:56:26 +00:00
Hugues Malphettes c77624a544 fix the regressions introduced by the support for dynamically installing bundles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3356 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-31 02:55:46 +00:00
Hugues Malphettes c1086a2e52 bug 347617 fix the trivial mistake
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3351 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 10:31:51 +00:00
Hugues Malphettes 831e84d114 Don't use Require-Bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3350 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 10:30:56 +00:00
Hugues Malphettes d031732aec bug 347617 Dynamically install/update/remove OSGi bundles discovered in the contexts folder
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3349 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 09:58:18 +00:00
Hugues Malphettes 8e744c0595 clean up the exported packages
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3348 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 08:21:25 +00:00
Hugues Malphettes b4a75c7633 update to the latest version.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3347 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 08:20:21 +00:00
Joakim Erdfelt b2bc821a20 Removing windows from tests that use '/tmp' directory assumption
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3320 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-27 16:44:56 +00:00
Michael Gorovoy e5387fb172 345729 Fixed test failure on Windows XP
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3298 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-27 02:23:24 +00:00
Michael Gorovoy c9b934ce56 345729 Fixed test failure on Windows XP
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3297 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-27 02:15:05 +00:00
Joakim Erdfelt ec5b98db58 Moving xml-configured-jetty.properties file creation into jettyHome for testing on windows reasons
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3294 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-27 01:10:45 +00:00
Joakim Erdfelt 2526693ba3 Making test more robust for debugging windows build error.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3290 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 22:53:59 +00:00
Jesse McConnell 54e885d967 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:20:58 +00:00
Jesse McConnell e35f16bae5 [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 12:14:37 +00:00
Jesse McConnell 64cbf74b09 reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 11:59:36 +00:00
Greg Wilkins 92c1a7bc5d [maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 08:51:01 +00:00
Greg Wilkins 7898b35e3d ready for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3273 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 06:48:31 +00:00
Greg Wilkins 4f42ec794e more getResource debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3272 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:58:32 +00:00
Jan Bartel f3a6c8f8ef 334443 - Improve the ability to specify extra class paths using the Jetty Maven Plugin
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3271 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:18:10 +00:00
Jan Bartel 07c619d457 336220 - tmp directory is not set if you reload a webapp with jetty-maven-plugin
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3270 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:13:56 +00:00
Greg Wilkins 09bb70c161 374174 Consistent mbean names
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3269 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 02:04:08 +00:00
Greg Wilkins 694db8e81e JETTY-1146 Encode jsessionid in sendRedirect
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3267 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-26 01:06:52 +00:00
Joakim Erdfelt e68c6ce9fb Using released version of jetty-test-helper
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3266 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 23:05:31 +00:00
Joakim Erdfelt d77ac8acb4 Using new jetty-test-helper 1.5-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3265 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 23:05:29 +00:00
Joakim Erdfelt 52820832a1 Making test more clear on assertion and failure (to help with windows failure)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3259 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 22:26:37 +00:00
Michael Gorovoy a00f7945a6 346124 Fixed UNC path resource test on Windows
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3257 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 16:12:22 +00:00
Simone Bordet be98ef70a1 Made test more reliable.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3256 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 14:15:35 +00:00
Simone Bordet 922fb70344 Fixes #347137 (Allow SSL renegotiations by default in HttpClient).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3255 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 11:47:26 +00:00
Simone Bordet 1bb56442a7 Improved SslSelectChannelEndPoint to free buffers when not needed, and added more truncation attack tests.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3253 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 09:56:04 +00:00
Michael Gorovoy 3ddabaf64f 346998 AbstractLifeCycle.isRunning() returns false if state changes from STARTING to STARTED during call
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3251 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-25 02:34:01 +00:00
Hugues Malphettes b40d6ea5a3 clean up for 7.4.2 (not important)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3248 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-24 07:33:28 +00:00
Simone Bordet eca44d8983 Rolled back temporary log statements.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3240 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 18:04:44 +00:00
Simone Bordet f166c40a6d Temporary logging for SSL truncation attacks.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3239 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 16:02:56 +00:00
Greg Wilkins 7df4156ed7 #34605 flat orbit space
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3238 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 08:28:20 +00:00
Greg Wilkins b2f5416fcd made HttpClient dumpable
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3236 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-23 01:21:52 +00:00
Hugues Malphettes 8425cf6b5d Not useful for the maven build: add equinoxconsole to the folders packaged in the bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3230 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-21 05:07:20 +00:00
Hugues Malphettes 30c9de57ab bug 34605 Clean-up
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3229 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-21 04:13:11 +00:00
Hugues Malphettes cd21c56d4b bug 34605 Export the package as x-internal for other bundles to be able tp extend those eventually.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3228 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-21 03:56:11 +00:00
Jesse McConnell 6574fc33cb organize imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3227 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 21:29:21 +00:00
Jesse McConnell ef3feecb52 Bug 346764 added new binding that provides ordered execution of bindings
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3226 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 20:54:25 +00:00
Simone Bordet f7d6bcad50 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@3225 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 13:47:21 +00:00
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
Simone Bordet 21d9fd77cf Added svn:ignore for 'target' directory.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3222 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 12:43:04 +00:00