handle CORS preflight request for profile upload (Safari)

brouter-server/src/main/java/btools/server/RouteServer.java

@@ -66,6 +66,17 @@ public class RouteServer extends Thread
             	handler = new ServerHandler( serviceContext, params );
             }
             else if ( url.startsWith( PROFILE_UPLOAD_URL ) )
+            {
+              if ( getline.startsWith("OPTIONS") )
+              {
+                // handle CORS preflight request (Safari)
+                String corsHeaders = "Access-Control-Allow-Methods: GET, POST\n"
+                                   + "Access-Control-Allow-Headers: Content-Type\n";
+                writeHttpHeader( bw, "text/plain", null, corsHeaders );
+                bw.flush();
+                return;
+              }
+              else
               {
                 writeHttpHeader(bw, "application/json");
 
@@ -82,6 +93,7 @@ public class RouteServer extends Thread
                 bw.flush();
                 return;
               }
+            }
             else
             {
             	throw new IllegalArgumentException( "unknown request syntax: " + getline );
@@ -213,6 +225,11 @@ public class RouteServer extends Thread
   }
 
   private static void writeHttpHeader( BufferedWriter bw, String mimeType, String fileName ) throws IOException
+  {
+    writeHttpHeader( bw, mimeType, fileName, null);
+  }
+
+  private static void writeHttpHeader( BufferedWriter bw, String mimeType, String fileName, String headers ) throws IOException
   {
     // http-header
     bw.write( "HTTP/1.1 200 OK\n" );
@@ -223,6 +240,10 @@ public class RouteServer extends Thread
       bw.write( "Content-Disposition: attachment; filename=" + fileName + "\n" );
     }
     bw.write( "Access-Control-Allow-Origin: *\n" );
+    if ( headers != null )
+    {
+      bw.write( headers );
+    }
     bw.write( "\n" );
   }
 }