Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 08:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,685 Commits 55 Branches 466 Tags
Commit Graph

632 Commits

Author SHA1 Message Date
Simone Bordet
c5931ad56f 404610 - Reintroduce ability to disallow TLS renegotiation. 
After review with Greg, avoid to clear the encrypted buffer after detection of reconnection denied.
 2013-04-05 01:26:51 +02:00
Greg Wilkins
5d451e5fec Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-04-05 08:31:48 +11:00
Greg Wilkins
1191142c97 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
 2013-04-05 08:31:31 +11:00
Simone Bordet
72219d016b 404610 - Reintroduce ability to disallow TLS renegotiation. 2013-04-04 17:11:01 +02:00
Greg Wilkins
e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins
df6e18cc00 404517 Close connection if request received after half close 2013-04-04 15:38:15 +11:00
Simone Bordet
b312fffd7e 402666 - Improve handling of TLS exceptions due to raw socket close. 2013-03-29 16:57:05 +01:00
Greg Wilkins
76607e20a5 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 16:19:58 +11:00
Greg Wilkins
8514e8452b 403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 15:37:00 +11:00
Greg Wilkins
5f1980f408 merged unsafe blocking Q, removed unsafe usage and usage of Q 2013-03-18 13:27:37 +11:00
Greg Wilkins
ba9d70589a Merge branch 'master' into unsafe 2013-03-18 12:02:37 +11:00
Simone Bordet
d6cac8cf0d 403451 - Review synchronization in SslConnection. 
The review consisted in finding all the places where SslConnection was calling application code
and made sure those call where performed outside synchronized blocks.

The few calls that remain within synchronized blocks are SslConnection.fillInterested() and
SelectChannelEndPoint.write(...), which are dealing with the encrypted connection and do not
call application code.
 2013-03-15 16:37:56 +01:00
Simone Bordet
b66ec3d57e Made isOpen() public to avoid clashes with AbstractEndPoint. 2013-03-15 16:37:56 +01:00
Joakim Erdfelt
8a96cc8c4a Merge branch 'jetty-7' into jetty-8 2013-03-14 16:54:35 -07:00
Joakim Erdfelt
5084a1430f Fixing build. 
+ Bumping jetty-test-helper to 2.0
 + Bumping jetty-version-maven-plugin to 1.0.10
 + Fixing JDK 1.5 build warts
 + Updating Stress use for new "test.stress" property introduced by upgrades
 2013-03-14 16:52:52 -07:00
Simone Bordet
91e5720ca2 Introduced a concurrent queue based on array chunks to reduce allocation, 
to be used as drop-in replacement of j.u.c.ConcurrentLinkedQueue.
Using it in SelectorManager.ManagedSelector, but build fails on OSGi.
 2013-03-07 10:00:50 +01:00
Greg Wilkins
056be85766 less verbose exception 2013-03-04 16:40:18 +11:00
Simone Bordet
2feafb9a97 402090 - httpsender PendingState cause uncertain data send to server. 
WriteFlusher was storing consumed buffers that may have been reused,
and when the write was being completed those consumed buffer may have
contained new content that was being written too.

Fixed by compacting the buffers at the moment of creation of the
WriteFlusher.PendingState (and not at the moment of the completeWrite() like
it was in historically done, see 4e9460161944b5ccfa4bf1b5494d96ef395a0e76).
 2013-03-01 14:30:51 +01:00
Greg Wilkins
718ee4ddeb 402075 Cancel idle timeouts on close 2013-03-01 14:09:04 +11:00
Jan Bartel
6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-02-22 11:32:57 +11:00
Simone Bordet
ecfd7f74e6 376273 - Early EOF because of SSL Protocol Error on https://api-3t.paypal.com/nvp. 
This was caused by the fact that the other peer closed the raw socket after sending data.
SslConnection was reading the data, but not notifying the application of the data, then
reading the abrupt close, which was causing an exception, ending up in the application
never being notified of the data that arrived.
Now we catch and ignore the exception during SSLEngine.closeInbound(), and we properly
send an alert to the other peer (instead of hard closing the connection as well).
In this way, the application has the chance to read the data and then close the connection.
 2013-02-21 17:15:19 +01:00
Greg Wilkins
68f3319719 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-15 12:14:48 +11:00
Greg Wilkins
c7d985fa02 400859 limit max size of writes from cached content 2013-02-15 11:20:29 +11:00
Joakim Erdfelt
ebaffcfd27 399535 - Websocket-client connect should have configurable connect timeout 
+ Made default value for connectTimeout be exposed from SelectorManager.
 + Added javadoc on time unit.
 2013-02-12 12:56:46 -07:00
Jan Bartel
495230579c 399576 Server dumpStdErr throws exception if server is stopping 2013-01-31 15:45:57 +11:00
Simone Bordet
b2f3852fb3 398872 - SslConnection should not be notified of idle timeouts. First solution. 2013-01-24 10:29:27 +01:00
Thomas Becker
9ebea3938d 393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1) 2013-01-17 10:28:15 +01:00
Joakim Erdfelt
c631d9b461 Removing noisy logging/debugging 2013-01-16 15:11:57 -07:00
Joakim Erdfelt
1dfee4c992 393733 - WebSocketClient interface should support multiple connections 
+ Reworking Connection Timeout handling
 2013-01-16 15:11:57 -07:00
Jesse McConnell
e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins
b5d4add750 jetty-9 copyright header 2013-01-11 16:02:33 +11:00
Greg Wilkins
76c068dfe6 jetty-9 refined the IdleTimeout mechanism and added a unit test 2013-01-11 13:06:42 +11:00
Greg Wilkins
6bfc19be1b jetty-9 optimisation to dispatch before parsing so that handling is done in same thread 2012-12-14 09:50:22 +11:00
Joakim Erdfelt
be83cb100d Adding java assert() on bad buffer release, per discussion with Simone and Jesse 2012-12-12 11:06:15 -07:00
Joakim Erdfelt
3fd59fa189 Rejecting BufferPool.release() of buffers below factor 2012-12-11 13:01:54 -07:00
Thomas Becker
e909bc4bc5 Fix WriteFlusher javadoc 2012-12-03 13:55:41 +01:00
Greg Wilkins
7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Jesse McConnell
d7e2bad665 add license block 2012-11-08 16:43:05 -06:00
Greg Wilkins
6cd32362d0 jetty-9 factored out IdleTimeout 2012-11-09 08:04:58 +11:00
Greg Wilkins
a1d0efc2bb 393832 start connectors last 2012-11-08 19:30:58 +11:00
Greg Wilkins
8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-11-02 13:17:53 +11:00
Greg Wilkins
65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Greg Wilkins
18f7293efd 392237 Fixed 3.0 port of chat servlet 2012-10-25 12:27:30 +11:00
Simone Bordet
c21a17ea83 #392463 - Client SSL handshake may hang. 
Now we check whether a fill() called from flush() has changed the SSLEngine state to NEED_WRAP,
and if so, we continue to wrap.
 2012-10-19 17:53:54 +02:00
Greg Wilkins
2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins
f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00
Greg Wilkins
b618ce59e3 392304 fixed intermittent client SSL failure. Correctly compact in flip2fill 2012-10-18 19:55:57 +11:00