You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2013/07/24 11:09:18 UTC

svn commit: r1506456 - in /manifoldcf/branches/release-1.3-branch: ./ CHANGES.txt framework/crawler-ui/src/main/webapp/login.jsp framework/crawler-ui/src/main/webapp/logout.jsp framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp

Author: kwright
Date: Wed Jul 24 09:09:17 2013
New Revision: 1506456

URL: http://svn.apache.org/r1506456
Log:
Pull up fix for CONNECTORS-759 to release branch.

Modified:
    manifoldcf/branches/release-1.3-branch/   (props changed)
    manifoldcf/branches/release-1.3-branch/CHANGES.txt
    manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/login.jsp
    manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/logout.jsp
    manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp

Propchange: manifoldcf/branches/release-1.3-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1506449

Modified: manifoldcf/branches/release-1.3-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/CHANGES.txt?rev=1506456&r1=1506455&r2=1506456&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.3-branch/CHANGES.txt Wed Jul 24 09:09:17 2013
@@ -1,12 +1,15 @@
 ManifoldCF Change Log
 $Id$
 
+======================= Release 1.3 =====================
+
+CONNECTORS-759: Fix broken content type for login page.
+(Shinichiro Abe, Karl Wright)
+
 CONNECTORS-757: NPE's from GoogleDrive connector when crawling
 documents that don't have a file length.
 (Piergiorgio Lucidi, Karl Wright)
 
-======================= Release 1.3 =====================
-
 CONNECTORS-756: Fix broken JDBC authority UI.
 (Karl Wright)
 

Modified: manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/login.jsp?rev=1506456&r1=1506455&r2=1506456&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/login.jsp (original)
+++ manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/login.jsp Wed Jul 24 09:09:17 2013
@@ -1,4 +1,9 @@
-<%@ include file="adminDefaults.jsp" %>
+<% response.setHeader("Pragma","No-cache");
+response.setDateHeader("Expires",0);
+response.setHeader("Cache-Control", "no-cache");
+response.setDateHeader("max-age", 0);
+response.setContentType("text/html;charset=utf-8");
+%><%@ include file="adminDefaults.jsp" %>
 
 <%
 /* $Id$ */

Modified: manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/logout.jsp?rev=1506456&r1=1506455&r2=1506456&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/logout.jsp (original)
+++ manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/logout.jsp Wed Jul 24 09:09:17 2013
@@ -1,4 +1,9 @@
-<%@ include file="adminDefaults.jsp" %>
+<% response.setHeader("Pragma","No-cache");
+response.setDateHeader("Expires",0);
+response.setHeader("Cache-Control", "no-cache");
+response.setDateHeader("max-age", 0);
+response.setContentType("text/html;charset=utf-8");
+%><%@ include file="adminDefaults.jsp" %>
 
 <%
 /* $Id$ */

Modified: manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp?rev=1506456&r1=1506455&r2=1506456&view=diff
==============================================================================
--- manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp (original)
+++ manifoldcf/branches/release-1.3-branch/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp Wed Jul 24 09:09:17 2013
@@ -1,4 +1,9 @@
-<%@ include file="adminDefaults.jsp" %>
+<% response.setHeader("Pragma","No-cache");
+response.setDateHeader("Expires",0);
+response.setHeader("Cache-Control", "no-cache");
+response.setDateHeader("max-age", 0);
+response.setContentType("text/html;charset=utf-8");
+%><%@ include file="adminDefaults.jsp" %>
 
 <%
 /* $Id$ */