aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2009-04-15 13:55:28 +0000
committerpdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d>2009-04-15 13:55:28 +0000
commiteb00b32adb0b6eecd08137164c26cb56e4da0849 (patch)
treea47cfa33ab1654ab7bb18a680b8ed05ed78c0226
parente4d6edc4620935a911aea8941df6b66f875064ea (diff)
downloadmoa-id-spss-eb00b32adb0b6eecd08137164c26cb56e4da0849.tar.gz
moa-id-spss-eb00b32adb0b6eecd08137164c26cb56e4da0849.tar.bz2
moa-id-spss-eb00b32adb0b6eecd08137164c26cb56e4da0849.zip
Removed duplicated setting of Content-Type during stream copying process
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1097 d688527b-c9ab-4aba-bd8d-4036d912da1d
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
index 543b33879..8e1767916 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/proxy/servlet/ProxyServlet.java
@@ -107,7 +107,7 @@ public class ProxyServlet extends HttpServlet {
/** Name of the Attribute for user binding */
private static final String ATT_OA_USER_BINDING = "UserBinding";
/** For extended internal debug messages */
- private static final boolean INTERNAL_DEBUG = false;
+ private static final boolean INTERNAL_DEBUG = false;
/** Message to be given if browser login failed */
private static final String RET_401_MSG = "<html><head><title>Ein Fehler ist aufgetreten</title></head><body><h1>Fehler bei der Anmeldung</h1><p>Bei der Anmeldung ist ein Fehler aufgetreten.</p><p>Fehler bei der Anmeldung. <br>Pr&uuml;fen Sie bitte ihre Berechtigung.<br><b>Abbruch durch den Benutzer.</b><br></p></body></html>";
@@ -610,7 +610,8 @@ private int tunnelRequest(HttpServletRequest req, HttpServletResponse resp, Map
resp.setStatus(conn.getResponseCode());
- resp.setContentType(conn.getContentType());
+ //Issue by Gregor Karlinger - content type was annotated twice
+ //resp.setContentType(conn.getContentType());
if (loginHeaders != null && (conn.getResponseCode()==HttpURLConnection.HTTP_OK || conn.getResponseCode()==HttpURLConnection.HTTP_MOVED_TEMP) && req.getSession().getAttribute(ATT_OA_AUTHORIZATION_HEADER)==null) {
req.getSession().setAttribute(ATT_OA_AUTHORIZATION_HEADER, authorizationvalue);