Greg Wilkins
6146f0cc9c
cleanup threadpool usage
2013-09-30 14:07:17 +10:00
Greg Wilkins
5f02620603
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Greg Wilkins
f07722909f
reduced routine exception verbosity
2013-09-30 12:45:16 +10:00
Greg Wilkins
643b6c3c77
removed ExecutorCallback
2013-09-26 18:06:10 +10:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Simone Bordet
4663fa4992
Renamed "Empty" inner classes to "Adapter" to comply with the rest of
...
the codebase.
2013-09-04 13:15:23 +02:00
Greg Wilkins
2e444d2f17
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Greg Wilkins
07ae3615ed
416321 handle failure during blocked committing write
2013-09-02 14:44:23 +10:00
Simone Bordet
ddca8bc327
Avoid StackOverflowErrors when submitting changes.
...
These were possible on a busy server, when many new connections are
created, and each triggers read interest: one connection submits the
read interest change, then runs the changes, finds that another
connections is created, runs it, which schedule a read interest
change, and so on.
Now the code is simpler, and while we always offer to the queue,
it may even be faster.
2013-08-29 20:04:01 +02:00
Simone Bordet
4923252ce4
Changed defaults for ArrayByteBufferPool.
...
There are cases, for example in WebSocket, where we want to allocate
small buffers to write frame headers and then do a gathered write.
ArrayByteBufferPool had a minimum size of 64 bytes,
which was too big and always led to allocation rather than pooling,
leading to performance slowdowns.
Defaults are now minSize=0, increment=1024.
2013-08-23 15:56:44 +02:00
Simone Bordet
72c4dbc46e
415062 SelectorManager wakeup optimisation.
...
Fixed race condition that could have allowed changes in queue but
selector waiting in select().
2013-08-23 14:12:11 +02:00
Greg Wilkins
c27020740f
415062 SelectorManager wakeup optimisation
2013-08-23 11:01:54 +10:00
Joakim Erdfelt
3c28bf8c60
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit edbf6e07aa
.
2013-08-16 14:38:10 -07:00
Joakim Erdfelt
fd3537e012
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit 2f0becff8f
.
2013-08-16 14:38:08 -07:00
Joakim Erdfelt
d351c82de8
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit b58c05d77c
.
2013-08-16 14:38:02 -07:00
Greg Wilkins
b58c05d77c
415062 SelectorManager wakeup optimisation
...
Some further cleanup after sbordet review
2013-08-17 00:01:20 +10:00
Greg Wilkins
2f0becff8f
415062 SelectorManager wakeup optimisation
...
removed wakeup spin
2013-08-16 19:23:59 +10:00
Greg Wilkins
edbf6e07aa
415062 SelectorManager wakeup optimisation
2013-08-16 16:35:38 +10:00
Thomas Becker
38549f20cd
FillInterest fix javadoc
2013-08-15 12:13:44 +02:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Joakim Erdfelt
5dbd746047
Fixing malformed Javadoc warnings in jetty-io
2013-08-14 12:46:25 -07:00
Simone Bordet
34032552ea
Avoid boxing of primitive int variables in logging statements.
2013-08-14 14:33:05 +02:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Greg Wilkins
b8f7637e7d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-22 23:32:04 +10:00
Thomas Becker
8946b4946b
SSLConnection comment out setting soLonger timeout to avoid threads stuck in preClose0
2013-07-22 11:52:13 +02:00
Greg Wilkins
3add75f135
398467 Servlet 3.1 Non Blocking IO
...
prevent fillInterest from HTTP after upgrade
2013-07-12 13:01:46 +10:00
Greg Wilkins
93faa8147b
398467 Servlet 3.1 Non Blocking IO
...
use nested classes for better stack trace
2013-07-11 19:13:58 +10:00
Greg Wilkins
e35914e400
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2013-07-09 00:32:41 +10:00
Greg Wilkins
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
Thomas Becker
f8049caf3d
412234 fix bug where NetworkTrafficSelectChannelEndpoint counted bytes wrong on incomplete writes
2013-07-03 18:13:07 +02:00
Greg Wilkins
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
Joakim Erdfelt
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
Joakim Erdfelt
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
Joakim Erdfelt
1f21c96f6c
411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes
...
+ Adding continuation in this rare SSL case to allow the remaining bytes
to be read properly.
2013-06-25 07:38:17 -07:00
Greg Wilkins
c0facf57f6
398467 simplified AbstractConnection fill interest handling
2013-06-24 14:36:22 +10:00
Jesse McConnell
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Jesse McConnell
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
Greg Wilkins
955e7e8d74
410559 Removed FillInterest race
2013-06-12 18:35:13 +10:00
Greg Wilkins
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Greg Wilkins
6732dcfe76
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
Removed the clear from ChannelEndPoint#flush
2013-06-06 17:13:45 +10:00
Greg Wilkins
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Jan Bartel
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Simone Bordet
b67f8204a5
Reverted commit 39d690e
.
2013-04-30 12:24:40 +02:00
Greg Wilkins
7955548d10
406390 Close if at END and content remaining
2013-04-29 14:01:11 +10:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
Jesse McConnell
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
Greg Wilkins
c912231d74
364921 - FIN WAIT sockets
2013-04-15 18:40:05 +10:00
Greg Wilkins
4b546de9c9
364921 - FIN WAIT sockets
2013-04-15 17:19:35 +10:00
Simone Bordet
70e6655ec5
364921 - FIN WAIT sockets.
...
Interim commit, as things are not working exactly right yet.
2013-04-12 23:17:24 +02:00
Greg Wilkins
9885449bdf
364921 improved close of SSL to avoid FINWAITs
2013-04-12 20:37:13 +10:00
Greg Wilkins
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
Greg Wilkins
39d690ed2a
404889 SelectorManager accepts attachments with sockets
2013-04-05 15:36:23 +11:00
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
e40e2a9913
Merged branch 'master' into 'unsafe'.
2013-03-13 22:37:36 +01:00
Jesse McConnell
acb5919844
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a
[maven-release-plugin] prepare release jetty-7.6.10.v20130312
2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6
[maven-release-plugin] prepare for next development iteration
2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01
[maven-release-plugin] prepare release jetty-8.1.10.v20130312
2013-03-12 09:05:14 -05:00
Joakim Erdfelt
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -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
Jesse McConnell
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06: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 4e94601619
).
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
Joakim Erdfelt
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00