333 Commits

Author SHA1 Message Date
Greg Wilkins
17e907c2fb git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Greg Wilkins
b890ff8fb2 applied jetty-7p 7f68abf..b2e4270, 7f68abf..a900c5e, 9a93c9e..9f94539. decomposed async and blocking handling. Simplified HttpFields and Buffer handling from the HttpParser. 2011-07-07 12:16:58 +10:00
Greg Wilkins
5c9fe5b13e 350642 Dont close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3437 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 04:38:47 +00:00
Greg Wilkins
c2a6df4c47 350642 Do not close SCEP during NIOBuffer manipulation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3436 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-29 02:51:09 +00:00
Greg Wilkins
aa990479f6 349896 SCEP supports zero maxIdleTime
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3408 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-21 04:09:30 +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
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
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
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
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
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
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
Simone Bordet
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
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
Jesse McConnell
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
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
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
54dcc72422 343083 better handling of isSecure
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3091 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 00:15:57 +00:00
Greg Wilkins
bda6438013 343923 check for half closed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3079 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:05:13 +00:00
Greg Wilkins
7227f8c6bb 343923 flush timeouts applied to outer loop
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3034 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-27 23:17:17 +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
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
Simone Bordet
51f21301d6 Ensure that if the read throws we close the EndPoint, so the connection can detect that the EndPoint is closed and act accordingly.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2933 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-30 13:19:36 +00:00
Greg Wilkins
fdf199e254 organized imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2912 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 05:59:18 +00:00
Greg Wilkins
a6483bfa6f 340265 Improve handling of io shutdown in SSL
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2906 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-23 03:36:06 +00:00
Greg Wilkins
80a56c31a2 websocket debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2887 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 12:06:28 +00:00
Greg Wilkins
3a267d9dd8 JETTY-1245 Pooled Buffers implementation
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2885 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-14 03:09:56 +00:00
Greg Wilkins
e20fa91252 337685 Update websocket API in preparation for draft -07
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2877 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-10 13:15:27 +00:00
Greg Wilkins
1a6cdeb12f 338880 Fixed failing buffer range checks
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2858 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 02:51:05 +00:00
Greg Wilkins
fbb0027f2e turned off scanner, nothing found since 7.3.0 other than false positives
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2851 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:15:35 +00:00
Greg Wilkins
d0b4ddcb28 rolled back the API changes for 7.3.1, will redo for 7.4.0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2846 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-02 12:21:12 +00:00
Joakim Erdfelt
0756914b2f Downgrading javadoc reference to class not visible from jetty-io, it causes javadoc errors/failures
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2838 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-01 17:03:24 +00:00
Greg Wilkins
2cc4fbb5ee 337685 Work in progress on draft 6 websockets
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2831 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-28 09:45:41 +00:00
Greg Wilkins
02e75add4f 337678 Readded optional async connection mode for HttpClient
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2809 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-22 03:28:43 +00:00
Greg Wilkins
cc3d015e60 337271 Flush SSL endpoint when dispatch thread held forever
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2797 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-16 21:19:43 +00:00
Simone Bordet
224b9a6552 Fixes #336793 (Tee data filled and flushed from endpoint).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2779 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-11 10:02:09 +00:00
Greg Wilkins
4ef97cfe3a 335329 Moved blocking timeout handling to outside try catch
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2777 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-11 06:08:06 +00:00
Greg Wilkins
3ca737037e 336793 Added Network Traffic Listener
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2772 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-10 10:14:25 +00:00
Greg Wilkins
5d2c3eee1b 336691 handle Views passed into flush
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2771 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-10 10:05:56 +00:00
Greg Wilkins
19c5b378c2 336691 fixed SSL close
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2769 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-10 05:05:49 +00:00
Joakim Erdfelt
c7d2d27945 Bumping up jetty-test-helper to v1.2 to use Stress helper.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2766 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-09 22:45:08 +00:00
Simone Bordet
41b6a9422c Fixes #336691 (Possible wrong length returned by ChannelEndPoint.flush() in case of RandomAccessFileBuffer).
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2750 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-09 10:18:58 +00:00
Greg Wilkins
40ebdcf23e NPE protection in dump
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2740 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 22:17:22 +00:00
Greg Wilkins
36e7aea16e 335641 sweep works with async
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2735 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 09:53:26 +00:00
Greg Wilkins
0b41841e0a 335641 added a sweep to check for error
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2728 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:09:47 +00:00
Greg Wilkins
f9458ee5ca 332937 Added Destroyable Dumpable interfaces and reworked dependent lifecycles, specially of JNDI
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2721 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 01:35:38 +00:00
Greg Wilkins
f807e15c77 335329 Stop SSL spin during handshake and renogotiate
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2719 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-01 01:57:12 +00:00
Simone Bordet
813d652e41 Fixes #335836 (Race when updating SelectChannelEndPoint._dispatched)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2714 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-31 12:28:38 +00:00
Greg Wilkins
af512e980a 335641 Cleaned up dispatch handling to avoid key.interestOps==0 when undispatched
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2710 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-31 03:19:14 +00:00