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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
850170ba5f
bug 346605 commit the demo of jetty's continuation and webscoket to 'chat with the equinox console
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3221 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-20 08:33:57 +00:00
538038a7f2
wait for second scan
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3220 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 23:26:29 +00:00
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
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
4ba3046a8b
Sending SSL close alert from both shutdownOutput() and close().
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3217 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 21:28:41 +00:00
c6665c228a
Removed output shutdown from close().
...
Since we now support correctly output shutdown, this is not needed anymore.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3216 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 21:27:57 +00:00
297d4cb49b
resolve some mvn warnings
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3215 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-19 14:32:49 +00:00
281360ab58
346124 ServletContext resources paths not resolved correctly when using UNC shares
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3214 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 23:24:22 +00:00
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
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
8f257c6fd8
Bug 345729 add license info and comment
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3211 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:43:13 +00:00
310cc72448
Bug 345729 change name of key classes
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3210 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:35:43 +00:00
b1edad57e4
Bug 345729 change example around to call as opposed to set
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3209 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 21:34:22 +00:00
a85e00f3ff
Bug 345729 remove previous solution in lew of more general approach allowing for the application of a jetty-web.xml type file to all contexts in the binding phase
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3208 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 20:01:09 +00:00
d722830f0b
Compilation error when building against older versions of OSGi.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3203 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 06:00:42 +00:00
59d60f33b8
bug 346027 Add required-bundles and fragment's required bundles to the pacckages where META-INF/web-fragments.xml and META-INF/resources are discovered.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3202 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 05:13:17 +00:00
0967a439f3
Added test-jetty-osgi module back to the build
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3201 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 05:02:46 +00:00
2585b4cd94
bug 346027 support for META-INF/web-fragment.xml and META-INF/resources/ inside fragments of a web-bundle
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3200 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 03:55:13 +00:00
d6639b77b5
bug 346027 tolerate META-INF/web-fragment.xml that are inside a directory instead of a jar.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3199 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 03:50:46 +00:00
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
990fea3a04
346179 o.e.j.util.ScannerTest fails on MacOS X platform
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3197 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 02:16:58 +00:00
5b7811ca76
This directive for the Export-Package does make the osgi test pass again.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3196 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 01:52:37 +00:00
68a23b060f
reset for normal operations
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3185 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 20:37:51 +00:00
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
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
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
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
fb576ea6af
setting ignores
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3179 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:37:34 +00:00
Joakim Erdfelt
Michael Gorovoy
Simone Bordet
Hugues Malphettes
Greg Wilkins
Jesse McConnell