3235 Commits

Author SHA1 Message Date
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
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
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
Jan Bartel
ba95a9ba3a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-05 08:43:21 +11:00
Jesse McConnell
4c6112d7a9 Merge branch 'release' 2011-12-04 15:33:35 -06:00
Jesse McConnell
8ef68e1e0e Updating VERSION.txt top section 2011-12-04 15:33:07 -06:00
Jan Bartel
15ab626410 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-05 08:31:49 +11:00
Jesse McConnell
41c746abee [maven-release-plugin] prepare for next development iteration 2011-12-04 14:18:52 -06:00
Jesse McConnell
0c90133252 [maven-release-plugin] prepare release jetty-7.6.0.RC1 jetty-7.6.0.RC1 2011-12-04 14:18:45 -06:00
Jesse McConnell
56cd2df556 Updating VERSION.txt top section 2011-12-04 12:11:35 -06:00
Jesse McConnell
0b83f2c82d Merge branch 'master' into release 2011-12-04 12:10:59 -06:00
Jan Bartel
c6480fc659 365375 ResourceHandler should be a HandlerWrapper 2011-12-02 15:32:33 +11:00
Greg Wilkins
050afb8d57 365370 ServletHandler can fall through to nested handler 2011-12-02 11:09:11 +11:00
Jan Bartel
468e6c284d 365267 NullPointerException in bad Address 2011-12-02 10:04:03 +11:00
Greg Wilkins
7e9fbc7493 handle no jetty-dir css 2011-12-02 09:43:15 +11:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
2011-11-30 16:27:30 +11:00
Greg Wilkins
9e72457941 Merge branch 'release-8' 2011-11-30 15:51:12 +11:00
Greg Wilkins
24ccaec3da Updating VERSION.txt top section 2011-11-30 15:50:25 +11:00
Greg Wilkins
631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins
9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins
46c10b2b8a Updating VERSION.txt top section 2011-11-30 12:46:36 +11:00
Greg Wilkins
dc92728c00 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
2011-11-30 12:21:02 +11:00
Greg Wilkins
df12605f0e Merge branch 'release' 2011-11-30 07:30:02 +11:00
Greg Wilkins
0b066d3d8e Updating VERSION.txt top section 2011-11-30 07:29:32 +11:00
Greg Wilkins
11e06e55b1 [maven-release-plugin] prepare for next development iteration 2011-11-29 23:56:11 +11:00
Greg Wilkins
fcf5f3beb2 [maven-release-plugin] prepare release jetty-7.6.0.RC0 jetty-7.6.0.RC0 2011-11-29 23:55:58 +11:00
Greg Wilkins
a47e07445a Upating VERSION.txt top section 2011-11-29 13:08:26 +11:00
Greg Wilkins
05784d5081 Merge branch 'master' into release 2011-11-29 13:06:38 +11:00
Greg Wilkins
f3b2289527 release version 2011-11-29 13:06:05 +11:00
Greg Wilkins
a420df6bf1 Merge branch 'master' into release 2011-11-29 13:03:23 +11:00
Greg Wilkins
c4b19d8262 safer test 2011-11-29 10:15:36 +11:00
Greg Wilkins
dcf7ef2335 fixes after merge 2011-11-29 10:15:20 +11:00
Greg Wilkins
55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins
4ce72ee549 improved test timing 2011-11-29 08:36:56 +11:00
Greg Wilkins
b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins
3b2d3e5754 websocket not supported on blocking connectors 2011-11-28 15:31:07 +11:00
Greg Wilkins
9fb6e9b43a 363943 ignore null attribute values 2011-11-28 14:08:09 +11:00
Greg Wilkins
c229a55ad9 362742 improved UTF8 exception reason 2011-11-28 14:00:35 +11:00
Greg Wilkins
11a79f7dee check nonce count 2011-11-28 12:06:43 +11:00