olivier lamy
|
2f6d0b3fb7
|
Merge branch 'jetty-9.4.x' into jetty-10.0.x
|
2019-01-17 15:35:27 +10:00 |
Olivier Lamy
|
766e088109
|
Issue #3241 Jetty runner add missing Main-Class in MANIFEST (#3260)
* Issue #3241 no Main Class attribute in MANIFEST for jetty-runner
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
|
2019-01-17 15:24:07 +10:00 |
Simone Bordet
|
2ddd00ec37
|
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
|
2019-01-16 17:33:13 +01:00 |
Simone Bordet
|
2a8b4c4c47
|
Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
|
2019-01-16 17:25:39 +01:00 |
Simone Bordet
|
0e17b56aaf
|
Updated ALPN to JDK 8u201 and 8u202.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
|
2019-01-16 17:12:25 +01:00 |
Simone Bordet
|
cdd553332c
|
Updated ALPN version for JDK 8u201 and 8u202.
|
2019-01-16 17:03:51 +01:00 |
olivier lamy
|
14aa789738
|
Merge branch 'jetty-9.4.x' into jetty-10.0.x
|
2019-01-16 21:48:57 +10:00 |
Greg Wilkins
|
4f65799a7b
|
Merge pull request #3222 from eclipse/jetty-10.0.x-3167-websocket-mapping
Jetty 10.0.x #3167 refactor websocket mapping
|
2019-01-16 09:13:42 +11:00 |
Lachlan Roberts
|
2fc6185c29
|
Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-15 13:11:06 -06:00 |
olivier lamy
|
027a91d224
|
maven assembly plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
|
2019-01-15 21:20:46 +10:00 |
Simone Bordet
|
1eb6339a6d
|
Merge pull request #3255 from eclipse/jetty-10.0.x-2095-remove_fcgi_multiplex
Fixes #2095 - Remove FastCGI multiplexing.
|
2019-01-15 11:02:00 +01:00 |
Greg Wilkins
|
4a70d1534e
|
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 17:59:09 +11:00 |
Greg Wilkins
|
5307f49bbc
|
Merge pull request #3259 from lachlan-roberts/jetty-10.0.x-websocket-tests
Issue #3246 - javax-websocket-tests exception stacktraces
|
2019-01-15 17:56:08 +11:00 |
Lachlan Roberts
|
dde42fc22e
|
Issue #3246 - fix possible illegal javadoc symbol
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-15 17:54:53 +11:00 |
Lachlan Roberts
|
b7219d9d9b
|
Issue #3246 - remove debugging code from cherry-picked commit
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-15 17:49:20 +11:00 |
Greg Wilkins
|
c84f97e983
|
Issue #3246 Avoid concurrent raw write on fuzzer client
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-15 16:58:30 +11:00 |
Greg Wilkins
|
4f570b62e3
|
BrowserTool enhancements
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 16:28:01 +11:00 |
Greg Wilkins
|
12655a0944
|
Working BrowserDebugTool for jetty websocket API
Plus fixes for 10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 15:54:09 +11:00 |
Jan Bartel
|
0e97d9b68d
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
|
2019-01-15 14:57:21 +11:00 |
Jan Bartel
|
9f3f3b78ae
|
Issue #3250 Ease osgi debugging (#3251)
Signed-off-by: Jan Bartel <janb@webtide.com>
|
2019-01-15 14:38:16 +11:00 |
Greg Wilkins
|
30db9addbb
|
fixed javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 14:13:13 +11:00 |
Greg Wilkins
|
e1daad1599
|
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 13:31:11 +11:00 |
Greg Wilkins
|
3246d07ca9
|
Revert "Working BrowserDebugTool for jetty websocket API"
This reverts commit c320e020d2 .
|
2019-01-15 13:14:53 +11:00 |
Greg Wilkins
|
664ddef6fd
|
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 09:44:53 +11:00 |
Greg Wilkins
|
39e6bff114
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 09:22:15 +11:00 |
Greg Wilkins
|
8802aebc1b
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 09:19:55 +11:00 |
Greg Wilkins
|
cd6964220f
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 09:11:43 +11:00 |
Greg Wilkins
|
4bacaf21e4
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-15 09:04:20 +11:00 |
Joakim Erdfelt
|
c320e020d2
|
Working BrowserDebugTool for jetty websocket API
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-14 10:13:59 -06:00 |
Greg Wilkins
|
5036893426
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-12 10:30:47 +11:00 |
Greg Wilkins
|
392412b2d0
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-12 10:26:09 +11:00 |
Greg Wilkins
|
d89e797a1b
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-12 10:06:59 +11:00 |
Greg Wilkins
|
a7e2ead7bc
|
Issue #3167 cleanups from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-12 09:12:02 +11:00 |
Joakim Erdfelt
|
74df6bf1a9
|
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-maven-plugin/src/it/it-parent-pom/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/ConfiguratorTest.java
# jetty-websocket/javax-websocket-server/src/main/java/org/eclipse/jetty/websocket/javax/server/JavaxWebSocketServerContainerInitializer.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/AbstractExtension.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/ExtensionStack.java
# jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserSocket.java
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/index.html
# jetty-websocket/websocket-server/src/test/resources/browser-debug-tool/websocket.js
|
2019-01-11 12:11:38 -06:00 |
Joakim Erdfelt
|
aa7f3bd071
|
Merge pull request #3245 from eclipse/jetty-9.4.x-issue-3242-websocket-dump-cleanup
Issue #3242 - WebSocket dump cleanup
|
2019-01-11 11:59:06 -06:00 |
Joakim Erdfelt
|
1b7ae00be3
|
Issue #3242 - Post-review cleanup of AbstractWebSocketConnection dump of EndPoint
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-11 11:27:10 -06:00 |
Joakim Erdfelt
|
e9143725b0
|
Issue #3242 - Post-review cleanup of ProxyEndPoint
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-11 10:23:51 -06:00 |
Joakim Erdfelt
|
478e5ac593
|
Issue #3242 - Post-review cleanup of WebSocket dump
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-11 10:16:46 -06:00 |
Simone Bordet
|
64edaff68a
|
Fixes #2095 - Remove FastCGI multiplexing.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
|
2019-01-11 11:56:42 +01:00 |
Olivier Lamy
|
69dc0059d1
|
use jackson-databind 2.9.8 (#3252)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
|
2019-01-10 22:12:12 +13:00 |
Greg Wilkins
|
ce3defa2f5
|
fixed debug
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-10 09:07:02 +11:00 |
Greg Wilkins
|
6ec615dc32
|
happy new year
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-10 08:47:31 +11:00 |
Greg Wilkins
|
9b0c8336ba
|
Merge branch 'jetty-10.0.x' into jetty-10.0.x-3167-websocket-mapping
Signed-off-by: Greg Wilkins <gregw@webtide.com>
|
2019-01-10 08:34:33 +11:00 |
Lachlan Roberts
|
40f1d5866f
|
call succeeded() to drain the queue instead of calling failed() in the
ExtensionStack Flusher
documentation fix in WriteFlusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-09 16:19:55 +11:00 |
Lachlan Roberts
|
c36d9bc3fc
|
Issue #3246 - suppressed logging for stacktrace in IdleTimeoutTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-09 14:37:51 +11:00 |
Lachlan Roberts
|
19e2ab8a70
|
Issue #3246 - fix to DecoderReaderManySmallTest stacktrace being logged
succeed the callback in EventIdFrameHandler after sending responses in
DecoderReaderManySmallTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
|
2019-01-09 14:32:37 +11:00 |
Joakim Erdfelt
|
020a980394
|
Merge pull request #3155 from eclipse/jetty-9.4.x-issue-3139-npe-websocket-sci
Fixes #3139 - NPE in WebSocketContainerInitializer
|
2019-01-08 15:57:35 -06:00 |
Joakim Erdfelt
|
bedb8e2a75
|
Merge pull request #3237 from lachlan-roberts/jetty-10.0.x-3236-CustomRequestLogTest_Failure
Issue #3236 - custom request log test failure
|
2019-01-08 15:51:48 -06:00 |
Joakim Erdfelt
|
aad5e97336
|
Issue #3242 - Relying on EndPoint.toString() for ProxyEndPoint.toString()
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-08 15:48:22 -06:00 |
Joakim Erdfelt
|
689fab4979
|
Issue #3242 - Cleaning up WebSocket dump
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
|
2019-01-08 15:47:49 -06:00 |