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
f4daeaedef
busting build to test release
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3178 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 19:33:05 +00:00
49bc4b51a0
fix javadoc errors
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3170 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 16:18:28 +00:00
40141c5e84
fix javadoc error
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3169 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 16:08:39 +00:00
3bea3fec87
more changes to the BND directive to get the proper version exported.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3168 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 15:32:33 +00:00
b3ff7fd7d9
make sure that the bundle generated imports the version 2.5 of the spec. not 0.0.0
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3167 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 14:27:29 +00:00
275a0da64d
Change the instructions for the maven-bundle-plugin to try to make it work for the new version 2.3.4. The osgi test is not passing yet though.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3166 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 14:26:30 +00:00
fd46348570
revert innocuous change that crept in my last commit
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3165 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 13:56:54 +00:00
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
c53749c232
338364 Fixed expires header for set cookies
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3162 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-17 06:55:40 +00:00
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
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
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
c004175909
346014 Fixed full HttpGenerator
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3158 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 23:42:26 +00:00
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
01c43b0ffe
remove bad awt import
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3156 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-16 20:48:17 +00:00
4a6f14f2a6
ABility to use an equinox hook to load the javax.servlet packages from the bootstrapping webapp.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3147 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-15 14:30:29 +00:00
bee5877ad1
345763 Source file is updated during the build
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3146 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-14 05:04:03 +00:00
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
c31facdec2
Bug 345729 add binding that can allow for global management of server and system classes for webapp contexts, added 2 gettings on webappcontext for getting default server and system class settings.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3144 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-13 20:22:17 +00:00
Simone Bordet
Hugues Malphettes
Greg Wilkins
Joakim Erdfelt
Jesse McConnell
Michael Gorovoy