f052fc30a3
Updating to 9.4.0-SNAPSHOT
2015-10-13 08:53:40 -07:00
4dfd68b315
Merge branch 'jetty-9.3.x'
...
Conflicts:
aggregates/jetty-all-compact3/pom.xml
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/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-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/cdi-core/pom.xml
jetty-cdi/cdi-full-servlet/pom.xml
jetty-cdi/cdi-servlet/pom.xml
jetty-cdi/cdi-websocket/pom.xml
jetty-cdi/pom.xml
jetty-cdi/test-cdi-webapp/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http2/http2-alpn-tests/pom.xml
jetty-http2/http2-client/pom.xml
jetty-http2/http2-common/pom.xml
jetty-http2/http2-hpack/pom.xml
jetty-http2/http2-http-client-transport/pom.xml
jetty-http2/http2-server/pom.xml
jetty-http2/pom.xml
jetty-infinispan/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/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-alpn/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-proxy/pom.xml
jetty-quickstart/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-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/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-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-http-client-transport/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-infinispan-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-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
2015-10-13 08:53:35 -07:00
785167a010
Bumping up gcloud to 9.3.5-SNAPSHOT
2015-10-13 08:39:58 -07:00
29d63b41b1
Merge branch 'jetty-9.2.x' into jetty-9.3.x
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
2015-10-13 08:39:45 -07:00
b02783220e
Renaming old 'SelectChannel*' test for new naming scheme
2015-10-13 08:10:16 -07:00
407ca46d94
Fix defect in DoSFilter where semaphore acquires my be leaked
...
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException". If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.
https://github.com/eclipse/jetty.project/pull/54
Signed-off-By: jentfoo@gmail.com
2015-10-13 08:48:45 +11:00
5b0427f9cc
Fix defect in DoSFilter where semaphore acquires my be leaked
...
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException". If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.
https://github.com/eclipse/jetty.project/pull/54
Signed-off-By: jentfoo@gmail.com
2015-10-13 08:46:25 +11:00
8f732a423d
allow non root user load config from /etc/default/
...
https://github.com/eclipse/jetty.project/pull/37
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
e571108030
execute throuth ssh without hanging
...
`ssh root@192.168.1.100 "service jetty restart"` will not exit after start.
https://github.com/eclipse/jetty.project/pull/36
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
6492ef7c78
Allow JETTY_USER to run without `su`
...
https://github.com/eclipse/jetty.project/pull/35
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
ff8c932b0f
Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x
2015-10-13 08:37:42 +11:00
84ef692be5
Merge branch 'gcloud-session-manager' into jetty-9.3.x
2015-10-13 08:36:36 +11:00
b0682ed423
allow non root user load config from /etc/default/
...
https://github.com/eclipse/jetty.project/pull/37
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:36:30 +11:00
73de40921c
Merge branch 'jetty-9.3.x' into gcloud-session-manager
2015-10-13 08:35:50 +11:00
dfd32e6790
execute throuth ssh without hanging
...
`ssh root@192.168.1.100 "service jetty restart"` will not exit after start.
https://github.com/eclipse/jetty.project/pull/36
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:33:59 +11:00
422be53960
Allow JETTY_USER to run without `su`
...
https://github.com/eclipse/jetty.project/pull/35
Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:30:42 +11:00
06593a546c
Using 8.0.27 release
2015-10-12 13:15:19 -07:00
e6ffa35b2c
479584 - WS Session does not contain UpgradeRequest information in WebSocketAdapter.onWebSocketConnect callback
...
+ Adding missing testcase
+ Adding missing request information
2015-10-12 11:19:50 -07:00
ccbd626cb2
479537 - Server preface sent after client preface reply.
...
Fixed by anticipating the onPreface() callback on server before
processing the client preface's SETTINGS frame.
2015-10-12 18:36:53 +02:00
3fd8a2e666
479537 - Server preface sent after client preface reply.
...
Fixed by anticipating the onPreface() callback on server before
processing the client preface's SETTINGS frame.
2015-10-12 17:52:19 +02:00
dcc3ad3f22
Bumping up apache-jsp to 8.0.27-SNAPSHOT
2015-10-09 10:14:49 -07:00
b4456d96dd
Disabling flappy test
2015-10-09 10:14:35 -07:00
43db989f7c
479343 calls to MetaData#orderFragments() with relative ordering adds duplicate jars
2015-10-09 11:52:32 +11:00
2cce7510e1
Updating to 9.3.5-SNAPSHOT
2015-10-08 17:49:09 -07:00
2bdb4e7474
479343 calls to MetaData#orderFragments() with relative ordering adds duplicate jars
2015-10-09 10:48:16 +11:00
7bb1cce754
Fix jmx-webapp-it tests for version 9.4.x
2015-10-09 10:33:09 +11:00
b1f963ae59
ForwardedFor module
2015-10-09 10:21:15 +11:00
47fbc100af
Merge branch 'release-9.3.4'
2015-10-08 10:56:58 -07:00
71c2d79daa
Merge branch 'master' into gcloud-session-manager
2015-10-08 11:41:49 +11:00
65dc76e21f
Ensure ServletHolder new initialization state is reset after doStop
2015-10-08 10:57:26 +11:00
35cbe3308b
Add initialized boolean to ServletHolder
...
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:57:19 +11:00
ea9c2cc9d9
Ensure ServletHolder new initialization state is reset after doStop
2015-10-08 10:55:10 +11:00
ce6f55f9df
Add initialized boolean to ServletHolder
...
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:50:45 +11:00
9cf0e34a1d
Updating to version 9.4.0-SNAPSHOT
2015-10-07 15:41:32 -07:00
37296bec3c
Updating to version 9.3.4.v20151007
2015-10-07 14:58:38 -07:00
f2e0a46058
478752 - Clarify support for HttpServletRequest.upgrade()
...
+ Indicating lack of upgrade() support with ServletException
2015-10-07 14:40:01 -07:00
29e64f5b1c
Fixed test.
2015-10-07 23:10:11 +02:00
0ca40b59c6
479277 - HttpClient with HTTP/2 transport does not work for "https" URLs.
...
Fixed by reworking how ClientConnectionFactories are handled by both
HTTP2Client and by HttpClientTransportOverHTTP2, to avoid that the
latter wraps the nested factories with SslConnection twice.
2015-10-07 21:39:02 +02:00
b2f8192c7b
478923 - threads stuck at SharedBlockingCallback$Blocker.block
...
Fixed the failure path so that it also checks for non blocking callbacks
and directly calls them
2015-10-07 15:11:53 +11:00
022f8e66f6
Merge branch 'master' into gcloud-session-manager
2015-10-07 12:13:00 +11:00
80675ce1d2
Javadoc fixes
2015-10-06 08:03:51 -07:00
7f82124d54
478862 Update to jstl 1.2.5
2015-10-06 19:30:37 +11:00
4d4ed7bbe2
478923 Add XML property for blockingTimeout
2015-10-06 09:14:19 +11:00
399755b352
479026 - Wrong CONNECT request idle timeout.
...
Explicitly set the CONNECT request idle timeout instead of inheriting
HttpClient's.
2015-10-05 11:52:58 +02:00
6aae1265bd
Removing redudant close reason trim (handled elsewhere now)
2015-10-02 10:47:10 -07:00
64d5718e9e
Removing System.out
2015-10-02 10:43:47 -07:00
cd17ff932a
478829 - WebsocketSession not cleaned up / memory leak
...
+ WebSocket Connection objects no longer need to
hold a reference to the WebSocketSession object
eliminating another reference to the WebSocketSession
that could hold GC efforts to clean it up
2015-10-02 10:33:32 -07:00
1e8d0db743
478829 - WebsocketSession not cleaned up / memory leak
...
+ Reducing looping references Session -> otherObj -> Session
+ Using Container LifeCycle bean management more consistently
+ All sessions are now child beans
+ A stopped session that hasn't been closed, will auto-close now
+ Using SessionListener more consistently
+ Client ConnectionManager no longer tracks Sessions
+ EventDriver stop cleans up its Session references
+ Moving all DummyConnection test classes to websocket-common:tests
2015-10-01 18:18:20 -07:00
cf6e26fd5d
Update to gcloud 0.0.8
2015-10-02 11:13:38 +10:00
c70d11c27d
Ensure webapp classloader used to reinflate session from gcloudatastore
2015-10-02 10:32:41 +10:00
Joakim Erdfelt
Mike Jensen
btpka3
Greg Wilkins
Jan Bartel
Simone Bordet
Wouter Bancken