a4d3740900
Merge branch 'jetty-8' -> 'master'
2013-03-18 12:34:57 -07:00
76607e20a5
403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 16:19:58 +11:00
2dec200c5d
disabled setuid for osx until built
2013-03-18 15:41:37 +11:00
8514e8452b
403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log
2013-03-18 15:37:00 +11:00
b69b52d984
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 15:27:10 +11:00
1eea7a2a89
Update to build with jdk1.7 which requires npn-boot jar v 1.1.5, and npn-api 1.1.0
2013-03-18 14:38:42 +11:00
25f5e38e13
403513 jetty:run goal cannot be executed twice during the maven build
2013-03-18 14:33:49 +11:00
5f1980f408
merged unsafe blocking Q, removed unsafe usage and usage of Q
2013-03-18 13:27:37 +11:00
ba9d70589a
Merge branch 'master' into unsafe
2013-03-18 12:02:37 +11:00
0d2fc88384
Fixed put() and timed offer() implementations in Unbounded.
2013-03-18 01:51:24 +01:00
47bf3eef0c
use async request log by default
2013-03-18 11:09:50 +11:00
e8d76ef12c
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
jetty-server/src/main/config/etc/jetty-requestlog.xml
jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
d21c8e5ca4
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-18 10:53:14 +11:00
63f2719938
403570 Asynchronous Request Logging
2013-03-18 10:48:06 +11:00
7ba6bb92b0
403281 jetty.sh waits for started or failure before returning
2013-03-16 10:36:43 +11:00
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
b66ec3d57e
Made isOpen() public to avoid clashes with AbstractEndPoint.
2013-03-15 16:37:56 +01:00
e1a31f468e
403370 move frameBytes.fail() call in StandardSession.flush() outside the synchronized block to avoid deadlock
2013-03-15 15:49:05 +01:00
6b9c0ac3e3
Merge branch 'jetty-7' into jetty-8
2013-03-14 23:32:19 -07:00
529c3cab9b
Fixing TestingDir does not implement MethodRule error by removing conflicting junit classes
2013-03-14 23:30:19 -07:00
d0f3db0f34
401150 close input stream used from cached resource
2013-03-15 16:00:40 +11:00
8dc6aca9cd
393972 Improve WebAppContext classloading javadoc
2013-03-15 15:42:07 +11:00
45916182d8
393971 Improve setParentLoaderPriorty javadoc
2013-03-15 15:38:31 +11:00
9535f0b599
385488 non existing resources in collection are just warnings
2013-03-15 15:07:20 +11:00
b15f9340d0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 14:40:19 +11:00
41feea7e01
402844 STOP.PORT & STOP.KEY behaviour has changed
2013-03-15 14:38:53 +11:00
436febc498
402694 setuid as LifeCycle listener
2013-03-15 13:33:20 +11:00
c577783fa6
inject new Q into ThreadPool
2013-03-15 12:30:49 +11:00
17e1839089
Merge branch 'master' into unsafe
2013-03-15 11:15:33 +11:00
8a96cc8c4a
Merge branch 'jetty-7' into jetty-8
2013-03-14 16:54:35 -07:00
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
55b7111cd5
Merge remote-tracking branch 'origin/jetty-8'
2013-03-15 08:33:53 +11:00
6448758fc0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-03-15 08:33:14 +11:00
cc34bdc20a
403281 jetty.sh waits for started or failure before returning
2013-03-15 08:32:24 +11:00
8a9f1f94e8
403373 - WebSocket change timeout log level from warn -> info
2013-03-14 10:00:02 -07:00
93efdcf080
384552 add comment to jetty-https.xml describing keymanager password
2013-03-14 11:23:55 +01:00
cd47727ce4
402982 Premature initialization of Servlets
2013-03-14 15:28:41 +11:00
c5ace89ffd
Updated npn.version property to 1.1.5
2013-03-14 14:02:25 +11:00
8ffff06d06
402626 Do not required endpoint host checking by default in server and configure in client
2013-03-14 12:47:56 +11:00
489220d6b4
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
jetty-distribution/src/main/resources/bin/jetty.sh
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
2013-03-14 12:44:33 +11:00
1cb201ef14
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-distribution/src/main/resources/bin/jetty.sh
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/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/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/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-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-03-14 12:40:29 +11:00
9397ba8782
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
VERSION.txt
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
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/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/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-policy/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-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-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
tests/pom.xml
tests/test-integration/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-03-14 12:22:33 +11:00
38d701753c
403281 jetty.sh waits for started before OK
...
Conflicts:
jetty-distribution/src/main/resources/bin/jetty.sh
2013-03-14 11:50:06 +11:00
a7238f2688
403281 jetty.sh waits for started before OK
2013-03-14 11:44:04 +11:00
f0a9f9caa0
Fixed signalling in ConcurrentArrayBlockingQueue.
2013-03-14 00:09:44 +01:00
29b83dff9b
402626 Do not required endpoint host checking by default
2013-03-14 09:25:28 +11:00
4a8b7409af
Second draft implementation of bounded and unbounded ConcurrentArrayBlockingQueue.
2013-03-13 22:57:37 +01:00
e40e2a9913
Merged branch 'master' into 'unsafe'.
2013-03-13 22:37:36 +01:00
0c4d457fce
Updated npn-boot version to 1.1.5.
2013-03-13 22:36:30 +01:00
a90a505316
401806 spdy push properly pass through request and response headers for pushed resources
2013-03-13 18:17:34 +01:00
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Simone Bordet
Thomas Becker