Greg Wilkins
978a7e8f15
Merge branch 'jetty-9.3-ewyk' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3-ewyk
2015-01-08 17:44:09 +01:00
Greg Wilkins
55bcd32448
fixed merge
2015-01-08 17:43:55 +01:00
Joakim Erdfelt
7e7dd40f0a
Happy New Year 2015 (merge from master)
2015-01-08 09:14:13 -07:00
Simone Bordet
0c21d7c78b
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-08 16:57:45 +01:00
Simone Bordet
51aafc78a4
457032 - Request sent from a failed CompleteListener due to connect timeout is failed immediately.
...
Fixed by copying the exchange queue and failing only the exchanges
that are present in the copy.
2015-01-08 16:56:59 +01:00
Greg Wilkins
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
Greg Wilkins
c23f21c761
456956 Reduce ThreadLocal.remove() weak reference garbage
...
removed getCurrentChannel thread local
2015-01-08 15:03:05 +01:00
Greg Wilkins
12f84c9592
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-08 12:03:55 +01:00
Greg Wilkins
9618f45ead
Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x
2015-01-08 11:40:02 +01:00
Greg Wilkins
3fed24127f
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-08 11:39:40 +01:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
629035ba7a
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
Greg Wilkins
2b530939a7
456956 Reduce ThreadLocal.remove() weak reference garbage
...
reduced calls to getCurrentConnection
2015-01-07 20:56:06 +01:00
Greg Wilkins
3270af81e8
456956 Reduce ThreadLocal.remove() weak reference garbage
2015-01-07 19:53:30 +01:00
Simone Bordet
337d638422
Merged branch 'master' into 'jetty-9.3-ewyk'.
2015-01-06 17:32:12 +01:00
Simone Bordet
379f9f6c43
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-06 17:30:43 +01:00
Simone Bordet
3abfbe26b3
Using the provider string when creating the SSLContext in case of no
...
keystore.
2015-01-06 17:30:03 +01:00
Simone Bordet
bb3f296626
Fixed byte arithmetic: byte is signed and can't be used as array
...
index without proper conversion to int.
2015-01-05 16:57:19 +01:00
Simone Bordet
c3582ceae2
Fixed test to be more reliable.
2015-01-05 13:32:55 +01:00
Simone Bordet
19570a7530
Removed printStackTrace() call.
2015-01-05 13:31:48 +01:00
Simone Bordet
5a63d765f7
Removed exceptions thrown for code that needed review.
2015-01-05 11:41:42 +01:00
Greg Wilkins
3d66b1d207
ensure onAllDataRead always called
2015-01-02 19:17:26 +01:00
Simone Bordet
5bed6323c1
Reworked buffer releasing to ensure that it is always executed before
...
fillInterested() is called.
This is needed to avoid race conditions where fillInterested()
triggers a new thread entering onFillable() and acquiring a new buffer
while the previous thread is releasing the previous buffer.
2015-01-02 18:43:07 +01:00
Jan Bartel
b1f1ebcc72
448944 Provide m2e lifecycle mapping metadata for jetty-jspc-maven-plugin
2015-01-02 18:29:52 +01:00
Simone Bordet
a85a74bbdc
Reworked buffer releasing to ensure that it is always executed before
...
fillInterested() is called.
This is needed to avoid race conditions where fillInterested()
triggers a new thread entering onFillable() and acquiring a new buffer
while the previous thread is releasing the previous buffer.
2015-01-02 18:22:39 +01:00
Simone Bordet
caa579ab4b
Fixed buffer leaking in case the buffer is empty due to having read
...
zero from the network.
2015-01-02 18:19:04 +01:00
Greg Wilkins
cc216eb8ee
fixed client proxy test
2015-01-02 15:38:12 +01:00
Greg Wilkins
e1e57924dc
fixed client test for new lazy consumeAll behaviour
2015-01-02 15:36:34 +01:00
Greg Wilkins
dcd9182f87
fixed client test for new lazy consumeAll behaviour
2015-01-02 15:31:34 +01:00
Greg Wilkins
a4d2895400
removed unneeded execute for SslConnection onFillable
2015-01-02 15:24:14 +01:00
Greg Wilkins
39b478e2c4
Speculative fix for EWYK SSL client
2015-01-02 14:33:25 +01:00
Greg Wilkins
3ad8f627e7
improved javadoc
2015-01-01 17:32:44 +01:00
Jan Bartel
381227cd9d
456486 Jar containing ServiceContainerInitializer impl not found in TCCL in osgi
2015-01-01 17:25:10 +01:00
Greg Wilkins
beacb948b1
Allow configuration of ExecutionStrategy
...
eg -Dorg.eclipse.jetty.io.ManagedSelector.ExecutionStrategy=org.eclipse.jetty.util.thread.ExecutionStrategy$ExecuteProduceRun
2015-01-01 17:04:00 +01:00
Greg Wilkins
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
Jan Bartel
b59782acf8
452201 Set the container classloader for osgi during webbundle undeploy
2015-01-01 15:53:33 +01:00
Jan Bartel
c92712779b
456426 Exception on context undeploy from EnvConfiguration
2015-01-01 12:05:03 +01:00
Greg Wilkins
451e27e736
454291 Added busy threads JMX attribute to QueuedThreadPool
...
Also-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-12-31 16:32:58 +01:00
Greg Wilkins
20fc880c3e
Merge branch 'master' into jetty-9.3-ewyk
2014-12-31 16:29:40 +01:00
Greg Wilkins
200b3a3e64
fixed merge
2014-12-31 16:28:35 +01:00
Greg Wilkins
2e3c223917
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-12-31 16:16:57 +01:00
Greg Wilkins
d2cd28f7fa
455863 Fixed jetty.sh handling of multiple JETTY_ARGS
...
Also-by: Adrian Muraru <amuraru@adobe.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-12-31 16:01:54 +01:00
Greg Wilkins
58faca9e09
430951 Improved ordering of SSL ciphers
2014-12-31 15:45:08 +01:00
Greg Wilkins
5f2a7fdfce
fixed http client respond before consumed test.
...
The server now is a bit lazier if the handler has not consumed content. It will not block to consume and gives up and closes the connection instead.
2014-12-31 11:48:23 +01:00
Joakim Erdfelt
a79b154d1b
456209 - Bad ContextClassLoader in WebSocket onMessage
...
+ Sets the class loader on an incoming frame to the
class loader that loaded the web socket session
Also-by: Michael MacFadden <michael@macfadden.org>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2014-12-29 12:10:55 -07:00
Greg Wilkins
191286970a
Use remote IP to distribute connections over selectors
2014-12-28 01:05:56 +01:00
Greg Wilkins
fd605248dc
Bah humbug
2014-12-25 10:21:20 +01:00
Greg Wilkins
a89a6927e8
yet another refactor of HttpInput.... must read -1 before isFinished is true
2014-12-24 19:34:06 +01:00
Jan Bartel
331d2a278d
455174 jetty-plus JNDI tests should use unique JNDI paths
2014-12-24 18:33:41 +01:00