10000 - Added "Cache-Control: no-cache" to error responses in the Server c… · javaxt-project/javaxt-jetty@f5ae442 · GitHub
[go: up one dir, main page]

Skip to content

Commit f5ae442

Browse files
author
pborissow
committed
- Added "Cache-Control: no-cache" to error responses in the Server class
- Added new setHeader() method to the HttpServletRequest class - Added overloaded close() method to the WebSocketListener class git-svn-id: svn://192.168.0.80/JavaXT/javaxt-jetty@1413 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff
1 parent 1668900 commit f5ae442

File tree

4 files changed

+44
-7
lines changed

4 files changed

+44
-7
lines changed

src/javaxt/http/Server.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@ private void sendError(
774774
}
775775
}
776776

777+
response.setHeader("Cache-Control", "no-cache");
777778
response.setStatus(e.getStatusCode());
778779
response.setContentType("text/plain");
779780

src/javaxt/http/servlet/HttpServletRequest.java

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import javax.servlet.ServletRequest;
88
import javax.servlet.ServletResponse;
99

10+
import org.eclipse.jetty.server.Request;
1011
import org.eclipse.jetty.server.HttpInput;
1112

1213
//******************************************************************************
@@ -22,6 +23,7 @@
2223

2324
public class HttpServletRequest {
2425

26+
private HttpServlet servlet;
2527
private javax.servlet.http.HttpServletRequest request;
2628
private HashMap<String, List<String>> parameters;
2729
private ServletContext servletContext;
@@ -42,6 +44,7 @@ public class HttpServletRequest {
4244

4345
public HttpServletRequest(javax.servlet.http.HttpServletRequest request, HttpServlet servlet){
4446
this.request = request;
47+
this.servlet = servlet;
4548
this.servletPath = servlet.getServletPath();
4649
this.servletContext = servlet.getServletContext();
4750

@@ -138,13 +141,31 @@ public String getHeader(String name){
138141
return request.getHeader(name);
139142
}
140143

141-
//
142-
// //**************************************************************************
143-
// //** setHeader
144-
// //**************************************************************************
145-
// public void setHeader(String name, String value){
146-
// request.setHeader(name, value);
147-
// }
144+
145+
//**************************************************************************
146+
//** setHeader
147+
//**************************************************************************
148+
public void setHeader(String name, String value){
149+
150+
Request req = Request.getBaseRequest(request);
151+
req.setHeader(name, value);
152+
153+
154+
//Reset authentication parameters
155+
authenticate = true;
156+
authenticationException = null;
157+
principal = null;
158+
getUserPrincipal = true;
159+
getCredentials = true;
160+
credentials = null;
161+
try{
162+
authenticator = servlet.getAuthenticator(this);
163+
}
164+
catch(Exception e){
165+
//TODO: Figure out how to propogate this error to the caller!
166+
e.printStackTrace();
167+
}
168+
}
148169

149170

150171
//**************************************************************************

src/javaxt/http/websocket/WebSocketListener.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,11 @@ public void close(){
166166
}
167167

168168

169+
public void close(int code, String reason){
170+
session.close(code, reason);
171+
}
172+
173+
169174
//**************************************************************************
170175
//** disconnect
171176
//**************************************************************************

src/org/eclipse/jetty/server/Request.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,16 @@ public String getHeader(String name)
866866
return metadata == null ? null : metadata.getFields().get(name);
867867
}
868868

869+
870+
public void setHeader(String name, String value)
871+
{
872+
MetaData.Request metadata = _metaData;
873+
if (metadata!=null){
874+
metadata.getFields().put(name, value);
875+
}
876+
}
877+
878+
869879
/*
870880
* @see javax.servlet.http.HttpServletRequest#getHeaderNames()
871881
*/

0 commit comments

Comments
 (0)
0