Joakim Erdfelt
6d907fa61d
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
2011-12-19 10:03:01 -07:00
Greg Wilkins
f7103d88f9
364638 reverted write after shutdown handling
2011-12-19 21:56:42 +11:00
Greg Wilkins
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
Greg Wilkins
f767d8d910
367048 improved handleRequest guard for suspended requests
2011-12-19 15:15:00 +11:00
Jan Bartel
397aa79a50
Merge remote-tracking branch 'origin/master' into bug-359329
2011-12-19 15:01:29 +11:00
Joakim Erdfelt
44de94f185
Attempting to write a better timeout test
2011-12-16 14:45:38 -07:00
Joakim Erdfelt
a5d18d48ad
Attempting to get a non-ssl version of the timeout bug into a unit test
2011-12-16 14:16:32 -07:00
Simone Bordet
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
Simone Bordet
d52ed502b0
Sketch of test for idle expiration on SSL.
2011-12-16 21:26:37 +01:00
Simone Bordet
ed1ee997b4
Fixed missing call to handle() in case of non-dispatched reads.
...
While performing a SSL write triggered by an application thread that is not
dispatched by the NIO layer, process() may read and decrypt bytes that will
be kept in the _unwrapBuf buffer.
However, the application needs to parse these bytes, but parsing is normally
performed only from handle() by a thread dispatched by the NIO layer.
The fix is to detect if there are unparsed bytes at the end of process(), and if
so, call asyncDispatch() to eventually call handle() to parse those bytes.
2011-12-16 20:58:18 +01:00
Simone Bordet
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
Joakim Erdfelt
2b626be186
Minor fixes for Windows build isues
2011-12-15 16:04:07 -07:00
Joakim Erdfelt
95d6b589a4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-15 11:11:13 -07:00
Joakim Erdfelt
5774c03e09
Refactoring protected fields back to private with protected methods per discussion with Simone
2011-12-15 11:07:27 -07:00
Jan Bartel
ee0ba9ceb1
Merge remote-tracking branch 'origin/master' into bug-359329
2011-12-15 20:22:37 +11:00
Jan Bartel
e515b5b7dc
JETTY-1460 suppress PrintWriter exceptions
2011-12-15 20:19:04 +11:00
Joakim Erdfelt
ae8c8551fc
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 14:07:37 -07:00
Greg Wilkins
300157fb2d
more time needed for ssl test on slow machine
2011-12-14 12:01:23 -08:00
Greg Wilkins
5c5f783e2b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 11:42:34 -08:00
Greg Wilkins
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
Joakim Erdfelt
c8e43ede1c
Merge branch 'master' into websocket-servlet-refactor
2011-12-14 11:15:20 -07:00
Joakim Erdfelt
6b42a1c45d
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
(Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
Joakim Erdfelt
42816041c0
JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
...
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
Simone Bordet
4aaf88af72
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-13 11:15:26 +01:00
Simone Bordet
bcbcbafb14
More tests for WebSocket over SSL.
2011-12-13 11:15:04 +01:00
Simone Bordet
fa0e06d186
Removed guard whether the channel is closed in checkIdleTimestamp().
...
This follows commit ff29a1cc51325ebf4f95feaa4bed847023a7e3fc for JETTY-1322.
The reason to remove the guard is that the channel may be closed multiple times, and if for any reason
a check to the idle timestamp triggers, then the idle callback is invoked, but it's not really idle: it is
already closed.
When used with SSL, this causes a truncation attack exception thrown by SSLEngine, because the idle
callback causes a shutdown of the SSLEngine without having received a SSL close alert.
2011-12-13 11:14:25 +01:00
Jan Bartel
d8c8d7a645
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-13 11:08:19 +11:00
Jan Bartel
dfb96dfeeb
366342 Dont persist DosFilter trackers in http session
2011-12-13 11:07:26 +11:00
Jesse McConnell
c1dac27886
Bug 366362 - JAX-WS over https returns the wrong request address. Applied patch by Kenny Stridh . Thanks!
2011-12-12 16:17:30 -06:00
Joakim Erdfelt
004fa1ce1c
Bug 365973 - Websocket client on android causes many VFY errors and
...
warnings.
+ Splitting out WebSocketConnection#handshake() into new
WebSocketServletConnection interface and refactoring accordingly,
in order to remove servlet-api dep on WebSocketConnection for
appropriate websocket client use.
2011-12-12 09:02:40 -07:00
Simone Bordet
416b6a8a15
Added guard against multiple closes: if the endPoint is already closed, skip updating the SSLEngine and/or the endPoint.
2011-12-12 16:57:14 +01:00
Jan Bartel
2c650a5fdd
366316 Superfluous printStackTrace on 404
2011-12-12 12:17:16 +11:00
hmalphettes
49556c0f40
bug 359329. missing import/export in jetty-plus jetty-jaspi
2011-12-09 16:52:58 +08:00
Joakim Erdfelt
ec297a5456
Bug 366106 - IncludableGzipFilter does not honor minGzipSize init param setting
...
+ IncludableGzipFilter#IncludableGzipWrapper now properly copies
minGzipSize, mimeTypes, and bufferSize configurables.
2011-12-08 14:30:38 -07:00
Joakim Erdfelt
600ae6043b
Bug 363415 - Update start.ini DEBUG enable
...
+ Fixing syntax for DEBUG of eclipse jetty specific classes.
2011-12-08 11:06:06 -07:00
Jan Bartel
0b1becf58d
364936 use Resource for opening URL streams
2011-12-08 12:16:36 +11:00
Joakim Erdfelt
6d2ad43cc4
365932 - Produce jetty-websocket aggregate jar for android use
...
+ revert last change using maven-shade-plugin as it didn't address
the now redundant transitive dependencies present in the
jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
2011-12-07 12:13:57 -07:00
Joakim Erdfelt
6b54650046
365932 - Produce jetty-websocket aggregate jar for android use
...
+ Adding maven-shade-plugin default configuration (no bytecode
manipulation) to produce an aggregate classifier jar for
jetty-websocket use.
2011-12-07 10:17:20 -07:00
Jesse McConnell
29eaab38aa
Merge branch 'release-8' into jetty-8
2011-12-06 16:31:38 -06:00
Jesse McConnell
c6d5d1713c
update version
2011-12-06 16:31:03 -06:00
Jesse McConnell
5aa79ebb15
[maven-release-plugin] prepare for next development iteration
2011-12-06 15:36:40 -06:00
Jesse McConnell
d178aad479
[maven-release-plugin] prepare release jetty-8.1.0.RC1
2011-12-06 15:36:34 -06:00
Jesse McConnell
f188ea4c0f
Updating VERSION.txt top section
2011-12-06 15:15:56 -06:00
Jesse McConnell
7e4af3617c
Merge branch 'jetty-8' into release-8
2011-12-06 15:15:15 -06:00
Jesse McConnell
7e6231f3ae
make sure that jsp version isn't kicked up to servelt 2.6 version
2011-12-06 15:13:12 -06:00
Jesse McConnell
26b5d5e589
update versions of orbit dependencies and fix a naming issue in test-jetty-osgi
2011-12-06 14:20:10 -06:00
Simone Bordet
0689e05e9b
365750 - Support WebSocket over SSL, aka wss://
...
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
2011-12-06 16:25:15 +01:00
hmalphettes
96eb1a6f92
workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix.
2011-12-06 20:49:31 +08:00
hmalphettes
f31f4150d8
workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix.
2011-12-06 20:45:57 +08:00
hmalphettes
a08f58634e
latest orbit libraries
2011-12-06 20:45:01 +08:00
