服务器模块：修复服务器无响应头BUG

server/Client.java

@@ -26,7 +26,7 @@ public static String GetType(Socket socket, String ExplorerPath) throws Exceptio
         {
             String Lastname = Client.GetLastName(ExplorerPath);
             //System.out.println(Lastname);
-            if (Lastname.equals(".png")) {
+            if (Lastname.equals(".png")||Lastname.equals(".ico")) {
                 //image pn
                 return "image/png";
             }

server/ServerClientConfig.java

@@ -9,8 +9,9 @@
 import java.util.concurrent.Future;
 
 public class ServerClientConfig  extends Thread {
-    public static void strict_origin_when_cross_origin(PrintWriter printWriter, String HttpURL, Socket socket) throws Exception
+    public static String strict_origin_when_cross_origin(PrintWriter printWriter, String HttpURL, Socket socket) throws Exception
     {
+	String re = "";
         File file = new File(main.GetServerPath());
         File[] files = file.listFiles();
         for (int i = 0 ; i < files.length ; i++)
@@ -24,16 +25,13 @@ public static void strict_origin_when_cross_origin(PrintWriter printWriter, Stri
                 String line = bufferedReader.readLine();
 
                 //System.out.println(line);
-                printWriter.println("HTTP/1.1 200 OK");
-                printWriter.println("strict-origin-when-cross-origin:"+line);
-                printWriter.println("Server:LinWin Http Server/1.0");
-                printWriter.println("Content-type:"+Client.GetType(socket,main.GetServerPath() + HttpURL));
-                printWriter.flush();
+                re = line;
 
                 bufferedReader.close();
                 fileReader.close();
                 break;
             }
         }
+	return re;
     }
 }

server/URL_Http.java

@@ -1,18 +1,11 @@
 
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintWriter;
+import java.io.*;
 import java.net.Socket;
 
-import javax.swing.text.html.HTML;
 
 public class URL_Http {
-    public static void URL_Return(Socket socket,String url)
+    public static void URL_Return(Socket socket,String url,String version)
     {
         try
         {
@@ -40,10 +33,10 @@ public static void URL_Return(Socket socket,String url)
                     File server = new File(configPath);
                     if (server.exists())
                     {
-                        main.SocketDIR(bufferedReader,outputStream,url,printWriter,server,socket);
+                        main.SocketDIR(bufferedReader,outputStream,url,printWriter,server,socket,version);
                         break;
                     }else{
-                        main.Page404(printWriter, url,outputStream,socket);
+                        main.Page404(printWriter, url,outputStream,socket,version);
                     }
                 }
             }
@@ -55,4 +48,23 @@ public static void URL_Return(Socket socket,String url)
             e.printStackTrace();
         }
     }
+    public static void Page500(PrintWriter printWriter,Socket socket,OutputStream outputStream) throws Exception
+    {
+        printWriter.println("HTTP/1.1 500 OK");
+        printWriter.println("Content-type:text/html");
+        printWriter.println("Server:LinWin Http Server");
+        printWriter.println();
+        printWriter.flush();
+        byte[] bytes = new byte[1024];
+        FileInputStream fis = new FileInputStream(config.GetErrorPage() + "/500.html");
+        BufferedOutputStream bos = new BufferedOutputStream(outputStream);
+        int len = 0;
+        while ((len = fis.read(bytes)) != -1) {
+            bos.write(bytes, 0, len);
+        }
+        bos.flush();
+        fis.close();
+        socket.shutdownOutput();
+        socket.close();
+    }
 }

server/WebSafety.java

@@ -5,7 +5,7 @@
 
 public class WebSafety {
 
-    public static void SQL_Security(String HttpURL, PrintWriter printWriter, OutputStream outputStream, Socket socket)
+    public static void SQL_Security(String HttpURL, PrintWriter printWriter, OutputStream outputStream, Socket socket,String version)
     {
         try
         {
@@ -27,7 +27,7 @@ public static void SQL_Security(String HttpURL, PrintWriter printWriter, OutputS
                 String pattern="SELECT\\s+(\\*|"+ownerenables+"\\s+"+from+")\\s+"+where+"\\s*"; //匹配最终sql的正则表达式
                 if (HttpURL.matches(pattern))
                 {
-                    main.Page405(printWriter,socket,outputStream);
+                    main.Page405(printWriter,socket,outputStream,version);
                     return;
                 }
             }
@@ -36,15 +36,15 @@ public static void SQL_Security(String HttpURL, PrintWriter printWriter, OutputS
             e.printStackTrace();
         }
     }
-    public static void XSS_Security(String HttpURL,PrintWriter printWriter,OutputStream outputStream,Socket socket)
+    public static void XSS_Security(String HttpURL,PrintWriter printWriter,OutputStream outputStream,Socket socket,String version)
             throws Exception
     {
         if (config.getSafe("XSS_Protection: "))
         {
             HttpURL = HttpURL.replace(" ","");
             if (HttpURL.indexOf("<script")!=-1||HttpURL.indexOf("</")!=-1||HttpURL.indexOf("<link")!=-1||HttpURL.indexOf("/>")!=-1||HttpURL.indexOf("%2")!=-1)
             {
-                main.Page405(printWriter,socket,outputStream);
+                main.Page405(printWriter,socket,outputStream,version);
                 return;
             }
         }