Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2013-08-28 18:49:29 +0000
committerJoakim Erdfelt2013-08-28 18:49:54 +0000
commitbe2385276f0a773e601126a667780e838dc73111 (patch)
tree70b56d695cd028de151055830525577b4b966aaa /jetty-websocket/websocket-api/src
parentac156b9111d6250ecabcca0e24ef782f4d86def6 (diff)
downloadorg.eclipse.jetty.project-be2385276f0a773e601126a667780e838dc73111.tar.gz
org.eclipse.jetty.project-be2385276f0a773e601126a667780e838dc73111.tar.xz
org.eclipse.jetty.project-be2385276f0a773e601126a667780e838dc73111.zip
WebSocket / Fixing support for permessage-deflate extension
Diffstat (limited to 'jetty-websocket/websocket-api/src')
-rw-r--r--jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Extension.java5
-rw-r--r--jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java8
2 files changed, 11 insertions, 2 deletions
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Extension.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Extension.java
index 64561a02bb..09064ffb48 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Extension.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/Extension.java
@@ -81,4 +81,9 @@ public interface Extension extends IncomingFrames, OutgoingFrames
* the next outgoing extension
*/
public void setNextOutgoingFrames(OutgoingFrames nextOutgoing);
+
+ // TODO: Extension should indicate if it requires boundary of fragments to be preserved
+
+ // TODO: Extension should indicate if it uses the Extension data field of frame for its own reasons.
+
} \ No newline at end of file
diff --git a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java
index 384275bf4c..04c01217de 100644
--- a/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java
+++ b/jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionConfig.java
@@ -96,8 +96,12 @@ public class ExtensionConfig
{
str.append(';');
str.append(param);
- str.append('=');
- QuoteUtil.quoteIfNeeded(str,parameters.get(param),";=");
+ String value = parameters.get(param);
+ if (value != null)
+ {
+ str.append('=');
+ QuoteUtil.quoteIfNeeded(str,value,";=");
+ }
}
return str.toString();
}

Back to the top