9d45e1bfc7
Merge pull request #3527 from eclipse/jetty-9.4.x-3526-websocket_locales
...
Fixes #3526 - Request locale not retained in WebsocketUpgrade request.
2019-04-05 22:59:13 +02:00
1b384329ae
Fixes #3526 - Request locale not retained in WebsocketUpgrade request.
...
Trivial fix, the locale was not copied from the HTTP requets to the
WebSocket upgrade request.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 17:50:41 +02:00
1ef851523f
Merge pull request #3372 from eclipse/jetty-9.4.x-3361-thread-safe-setHandlers
...
Issue #3361 thread safe setHandlers
2019-04-05 09:01:26 +02:00
e4e72968cd
Issue #3361 - HandlerCollection.addHandler is lacking synchronization.
...
Removed unused code.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 09:00:45 +02:00
97d501d444
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-3361-thread-safe-setHandlers'.
2019-04-05 08:47:34 +02:00
a982422b40
Issue #3494 - QueuedThreadPool bug - jobs disappearing on lifecycle stop.
...
Small fixes after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 08:36:18 +02:00
3dd58fae22
Merge pull request #3520 from lachlan-roberts/jetty-9.4.x-queuedThreadPoolBug
...
QueuedThreadPool bug - jobs disappearing on lifecycle stop #3494
2019-04-05 08:32:22 +02:00
a15154c290
Issue #3481 - TLS close_notify() is not guaranteed.
...
Making sure that if a wrap() requires multiple passes,
they are done before returning.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-05 17:20:43 +11:00
36df72d455
Issue #3481 TLS Close
...
Updates from review:
- revert outputShutdown logic
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
db60003099
Issue #3481 TLS Close
...
Updates from review:
- cleanup isEmpty logic
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
8a13085493
Issue #3481 TLS Close
...
Updates from review:
- fixed flush return for NEED_UNWRAP
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
33e3894796
Issue #3481 TLS Close
...
Updates from review:
- shutdown after flush
- close if write fails
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
b7bae5c683
Issue #3481 cleanups
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
e109116806
Issue #3481 Blocked TLS close
...
Added test harness
removed retry loop in favour of single retry then write
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
d96d6178de
Issue #3481
...
async write of close handshake
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
dc7d0b70e3
Issue #3481 provisional work around
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-05 17:20:43 +11:00
54690185ef
Issue #3382 - update to javadoc from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-05 17:03:20 +11:00
3f0ed2cc1a
Issue #3382 - changes from review
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-04-05 13:14:17 +11:00
6cd5fb42e9
Issue #3494 - adjustments to WebSocketChannel processConnectionError
...
WebSocketChannel.processConnectionError now defaults to NO_CLOSE
status if no protocol reasons can be found
added some debug logging
improvements to tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-05 12:18:09 +11:00
b6b7d2e730
Issue #3133 - Logging of key.readyOps() can throw unchecked CancelledKeyException.
...
Changed logging to level IGNORE, since it's too verbose when debugging.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-04 12:18:16 +02:00
0684377c88
updated version.txt
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-04 16:40:39 +11:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
ebd676df5d
fix header
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-04 10:16:56 +10:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
1097354611
Issue #3494 - QueuedThreadPool changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-04 10:46:54 +11:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
fd06182e2a
Fixing CRLF files
2019-04-03 18:11:41 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
5665bde3dd
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
2019-04-03 18:08:56 -05:00
954a8bd6a3
Fixing bad merge of Resource.java
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 18:08:36 -05:00
81356d9d18
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:45 -05:00
cd3e8f0cd2
Issue #3274 - Exclude org osgi foundation jar for conflicts with java base classes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:47:33 -05:00
7478c04351
Merge branch `jetty-9.3.x` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# Jenkinsfile
# VERSION.txt
# 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-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/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-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-http-spi/pom.xml
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# 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-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# 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-fragment/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-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/pom.xml
# jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-servlets/pom.xml
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# 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-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-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
2019-04-03 17:47:18 -05:00
554fc39f06
Merge branch `jetty-9.2.x` into `jetty-9.3.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
# jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
# jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
# jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
# jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
# jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
# jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
2019-04-03 17:19:34 -05:00
31b0de2285
Issue #3319 - Fixing listing output dir slash expectation from tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:12:26 -05:00
b929f5c2db
Issue #3319 - Applying changes from review with @sbordet
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 17:01:16 -05:00
ca77bd384a
Issue #3319 - Refactoring DefaultServlet Index/Listing
...
+ Now generates valid HTML5
+ Now allows column sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 16:28:26 -05:00
1f046f44fe
Fixing CRLF issues.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-03 15:24:29 -05:00
c677088aed
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-03 19:25:47 +02:00
a18c2c49f9
Issue #3464 - Split SslContextFactory into Client and Server
...
Fixed a couple of places where Server was used instead of Client.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:24:14 +02:00
ec273b7cf0
Fixes after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-03 19:13:19 +02:00
edaefdbb3b
Fixing CRLF files
2019-04-03 11:56:07 -05:00
0638ad1bd9
do not activate mongodb test
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 18:48:55 +10:00
b9b1ade5da
Jetty 9.3.x same jenkinsfile as 9.4.x ( #3522 )
...
* use same Jenkinsfile as 9.4.x
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use only jdk8 even for javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 18:08:07 +10:00
6051d135f2
fix version in pom and use trick from 9.4.x branch with flatten-maven-plugin
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-03 17:31:52 +10:00
c0c2996339
fixed annotationtest
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-04-03 18:18:48 +11:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
5eed464730
Issue #3382 - delay any frames received while suspended until resumed
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-03 17:24:40 +11:00
7df8140137
Issue #3494 - failures in testRemoteDisconnect because of timeout
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-04-03 14:50:37 +11:00
Simone Bordet
Greg Wilkins
Lachlan Roberts
Joakim Erdfelt
olivier lamy
Olivier Lamy