- Removed the HttpPreprocessor class. The original motivation for the HttpPreprocessor came from the initial implementation of the WebSockets plugin. The logic there has changed making the HttpPreprocessor class obsolete.

pborissow · pborissow · commit d794072292a8 · 2017-11-11T22:54:14.000Z
git-svn-id: svn://192.168.0.80/JavaXT/javaxt-jetty@916 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
diff --git a/src/javaxt/http/Server.java b/src/javaxt/http/Server.java
@@ -401,24 +401,17 @@ private RequestHandler(HttpServlet servlet, SessionDataStore sessionStore){
         @Override
         public void doStart() throws Exception {
 
-          //Initialize preprocessors
-            for (javaxt.http.servlet.HttpPreprocessor preprocessor : servlet.getPreprocessors()){
-                preprocessor.init(this);
-            }
             
-          //Initialize servlet
-            init();
+          //Initialize ServletContext
+            ContextHandler.Context context=ContextHandler.getCurrentContext();
+            javax.servlet.ServletContext servletContext=context==null?new ContextHandler.StaticContext():context;
 
             
-          //Call parent
-            super.doStart();
-        }        
-        
-        private void init() throws javaxt.http.servlet.ServletException{
+          //Add the RequestHandler to the ServletContext
+            servletContext.setAttribute("org.eclipse.jetty.server.Handler", this);
+
             
-          //Initialize ServletContext
-            ContextHandler.Context context=ContextHandler.getCurrentContext();
-            javax.servlet.ServletContext servletContext=context==null?new ContextHandler.StaticContext():context;                
+          //Add ServletContext to the HttpServlet
             servlet.setServletContext(new ServletContext(servletContext));
 
 
@@ -455,6 +448,10 @@ private void init() throws javaxt.http.servlet.ServletException{
             
             javax.servlet.ServletConfig ServletConfig = null;
             servlet.init(ServletConfig);
+            
+            
+          //Call parent
+            super.doStart();
         }
         
         @Override
@@ -464,23 +461,24 @@ public void handle(
             javax.servlet.http.HttpServletResponse response) 
             throws IOException, javax.servlet.ServletException {
 
-            
-            for (javaxt.http.servlet.HttpPreprocessor preprocessor : servlet.getPreprocessors()){
-                boolean processedRequest = preprocessor.processRequest(request, response);
-                if (processedRequest){
-                    baseRequest.setHandled(true);
-                    return;
-                }
-            }
-            
+          //Add reference to the baseRequest to the HttpServletRequest
+            request.setAttribute("org.eclipse.jetty.server.Request", baseRequest);
+
             
           //Set session handler
             baseRequest.setSessionHandler(sessionHandler);
 
 
           //Jetty doesn't return the correct scheme for HTTPS so we need to update the baseRequest
             org.eclipse.jetty.io.EndPoint endPoint = baseRequest.getHttpChannel().getEndPoint();
-            baseRequest.setScheme((endPoint instanceof SslConnection.DecryptedEndPoint)? "https" : "http");
+            if (endPoint instanceof SslConnection.DecryptedEndPoint){
+                baseRequest.setScheme("https");
+                baseRequest.setSecure(true);
+            }
+            else{
+                baseRequest.setScheme("http");
+                baseRequest.setSecure(false);
+            }
 
 
           //Instantiate the JavaXT versions of Request and Response objects
diff --git a/src/javaxt/http/servlet/HttpPreprocessor.java b/src/javaxt/http/servlet/HttpPreprocessor.java
diff --git a/src/javaxt/http/servlet/HttpServlet.java b/src/javaxt/http/servlet/HttpServlet.java
@@ -20,7 +20,7 @@ public abstract class HttpServlet {
     private javax.net.ssl.TrustManager[] tms;
     private String sslProvider;
     private ServletContext servletContext;
-    private java.util.List<HttpPreprocessor> preprocessors = new java.util.LinkedList<>();
+
 
   //**************************************************************************
   //** init
@@ -77,27 +77,7 @@ public void setServletContext(ServletContext servletContext){
     public void log(String str){
         //TODO: Implement logger
     }
-    
-    
-  //**************************************************************************
-  //** getPreprocessors
-  //**************************************************************************
-    public java.util.List<HttpPreprocessor> getPreprocessors(){
-        return preprocessors;
-    }
 
-
-  //**************************************************************************
-  //** addPreprocessor
-  //**************************************************************************
-  /** Used to add a Preprocessor to the servlet container. 
-   */
-    public void addPreprocessor(HttpPreprocessor preprocessor){
-        synchronized(preprocessors){
-            preprocessors.add(preprocessor);
-            preprocessors.notify();
-        }
-    }
     
     
 //  //**************************************************************************
diff --git a/src/javaxt/http/servlet/HttpServletRequest.java b/src/javaxt/http/servlet/HttpServletRequest.java
@@ -67,6 +67,10 @@ public HttpServletRequest(javax.servlet.http.HttpServletRequest request, HttpSer
         
     }
     
+    protected javax.servlet.http.HttpServletRequest getBaseRequest(){
+        return request;
+    }
+    
 
   //**************************************************************************
   //** getRemoteAddr
diff --git a/src/javaxt/http/servlet/HttpServletResponse.java b/src/javaxt/http/servlet/HttpServletResponse.java
@@ -48,16 +48,22 @@ public HttpServletResponse(HttpServletRequest request, javax.servlet.http.HttpSe
         this.response = response;
         
         
-      //Set default response headers
-        //setHeader("Accept-Ranges", "bytes");
-        setHeader("Connection", (request.isKeepAlive() ? "Keep-Alive" : "Close"));
-        setHeader("Server", request.getServletContext().getServerInfo());
-        setHeader("Date", getDate(Calendar.getInstance()));
-        setStatus(200, "OK");
+      //Set default response headers for standard HTTP/S requests. WebSockets and
+      //other upgrade requests should be handled differently.
+        if (request.getHeader("Upgrade")==null){
+            //if (request.getHeader("Upgrade")
+            //setHeader("Accept-Ranges", "bytes");
+            setHeader("Connection", (request.isKeepAlive() ? "Keep-Alive" : "Close"));
+            setHeader("Server", request.getServletContext().getServerInfo());
+            setHeader("Date", getDate(Calendar.getInstance()));
+            setStatus(200, "OK");
+        }
     }
     
     
-
+    protected javax.servlet.http.HttpServletResponse getBaseResponse(){
+        return response;
+    }
 
   //**************************************************************************
   //** addCookie

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ public HttpServletRequest(javax.servlet.http.HttpServletRequest request, HttpSer`
`67`	`67`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ protected javax.servlet.http.HttpServletRequest getBaseRequest(){`
	`71`	`+ return request;`
	`72`	`+ }`
	`73`	`+`
`70`	`74`
`71`	`75`	`//**************************************************************************`
`72`	`76`	`//** getRemoteAddr`