Browse Source

hack fix protocol errors/changes

Martin Kunz 4 years ago
parent
commit
d1137c58e5

+ 3 - 2
src/main/java/at/acdp/urweb/sclient/SecondaryClient.java

@@ -152,13 +152,14 @@ public class SecondaryClient {
                 break;
             default:
                 log.warn("unknown ptype: "+pType+", size: "+size);
-                byte[] pack=new byte[size-5];
-                di.readFully(pack);
+                skip(43, di, size);
         }
         int afterCount=di.getCount();
         int diff=afterCount-beforeCount-size;
         if(diff!=0) {
             log.warn("size mismatch: " +diff + "package type: "+pType);
+            byte[] pack=new byte[-diff];
+            di.readFully(pack);
         }
         return size;
     }

+ 1 - 1
src/main/java/at/acdp/urweb/web/WebServer.java

@@ -29,7 +29,7 @@ public class WebServer {
         // this.rtbot.start();
         port(params.port);
         if (!params.webroot.isEmpty())
-            staticFileLocation(params.webroot);
+            externalStaticFileLocation(params.webroot);
         else
             staticFiles.location("/webroot");