Browse Source

+ integrate Grizzly 2.3.8

oleksiys 11 years ago
parent
commit
ca5db7ca5b

+ 1 - 1
grizzly-bm/pom.xml

@@ -68,7 +68,7 @@
         <dependency>
         <dependency>
             <groupId>org.glassfish.grizzly</groupId>
             <groupId>org.glassfish.grizzly</groupId>
             <artifactId>grizzly-http-server</artifactId>
             <artifactId>grizzly-http-server</artifactId>
-            <version>2.3.8-beta2</version>
+            <version>2.3.8</version>
         </dependency>
         </dependency>
         <dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <groupId>com.fasterxml.jackson.core</groupId>

+ 3 - 1
grizzly-bm/src/main/java/org/glassfish/grizzly/bm/Server.java

@@ -4,13 +4,15 @@ import org.glassfish.grizzly.Grizzly;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.server.HttpServer;
 import org.glassfish.grizzly.http.server.NetworkListener;
 import org.glassfish.grizzly.http.server.NetworkListener;
 import org.glassfish.grizzly.http.server.RequestExecutorProvider;
 import org.glassfish.grizzly.http.server.RequestExecutorProvider;
+import org.glassfish.grizzly.http.util.HeaderValue;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
 
 
 /**
 /**
  * HttpServer
  * HttpServer
  */
  */
 public class Server {
 public class Server {
-    public static final String SERVER_VERSION = "Grizzly/" + Grizzly.getDotedVersion();
+    public static final HeaderValue SERVER_VERSION =
+            HeaderValue.newHeaderValue("GRZLY").prepare();
     
     
     // The RequestExecutorProvider, which will run HTTP request processing
     // The RequestExecutorProvider, which will run HTTP request processing
     // in the same thread
     // in the same thread