Fix webserver to be compatible with Webbit 0.4.14

operasoftware · Aug 9, 2013 · e4c6255 · e4c6255
1 parent 424b5a1
commit e4c6255
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/test/com/opera/core/systems/environment/webserver/ImprovedStaticFileHandler.java b/test/com/opera/core/systems/environment/webserver/ImprovedStaticFileHandler.java
@@ -34,4 +34,26 @@ public ImprovedStaticFileHandler(File dir) {
     enableDirectoryListing(true);
   }
 
-}
+  @Override
+  protected void serve(final String mimeType,
+                       final byte[] staticContents,
+                       HttpControl control,
+                       final HttpResponse response,
+                       final HttpRequest request,
+                       final String path) {
+    control.execute(new Runnable() {
+      public void run() {
+        if (mimeType != null) {
+          response.header("Content-Type", mimeType.split(";")[0]);
+        }
+        ByteBuffer contents = ByteBuffer.wrap(staticContents);
+
+        response
+            .header("Content-Length", contents.remaining())
+            .content(contents)
+            .end();
+      }
+    });
+  }
+
+}
diff --git a/test/com/opera/core/systems/environment/webserver/PathAugmentingStaticFileHandler.java b/test/com/opera/core/systems/environment/webserver/PathAugmentingStaticFileHandler.java
@@ -59,4 +59,4 @@ protected File resolveFile(String path) throws IOException {
     }
   }
 
-}
+}