Index: /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/properties/portal.properties
===================================================================
--- /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/properties/portal.properties	(revision 43890)
+++ /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/properties/portal.properties	(working copy)
@@ -529,6 +529,9 @@
 # Proxy rewriting is used to avoid mixed content when running the portal
 # over ssl.
 #
+# If you enable the ProxyWriter you also MUST un-comment the HttpProxyServlet
+# <servlet> and <servlet-mapping> blocks in the uPortal web.xml
+#
 org.jasig.portal.serialize.ProxyWriter.resource_proxy_enabled=off
 
 
Index: /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/source/org/jasig/portal/HttpProxyServlet.java
===================================================================
--- /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/source/org/jasig/portal/HttpProxyServlet.java	(revision 43890)
+++ /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/source/org/jasig/portal/HttpProxyServlet.java	(working copy)
@@ -123,7 +123,10 @@
         if (!contentType.getValue().startsWith("image")){
             response.setStatus(404);
             log.info("httpProxyServlet returning response 404 after receiving element with contentType ="+contentType);
-        }		response.setContentType(contentType.getValue());
+            // returning here is important! This prevents the servlet from proxying the non-image content.
+            return;
+        }		
+        response.setContentType(contentType.getValue());
 
 		final ServletOutputStream out = response.getOutputStream();
 		try {
Index: /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/webpages/WEB-INF/web.xml
===================================================================
--- /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/webpages/WEB-INF/web.xml	(revision 43890)
+++ /Users/apetro/Documents/uP3/svnbox/uPortal/branches/rel-2-6-patches/webpages/WEB-INF/web.xml	(working copy)
@@ -66,6 +66,7 @@
     <load-on-startup>3</load-on-startup>
   </servlet>
 
+<!-- Uncomment this servlet and the corresponding servlet-mapping if ProxyWriter is enabled in portal.properties
   <servlet>
     <servlet-name>HttpProxyServlet</servlet-name>
     <servlet-class>org.jasig.portal.HttpProxyServlet</servlet-class>
@@ -70,6 +71,7 @@
     <servlet-name>HttpProxyServlet</servlet-name>
     <servlet-class>org.jasig.portal.HttpProxyServlet</servlet-class>
   </servlet>
+  -->  
   
   <servlet>
     <servlet-name>Problems</servlet-name>
@@ -106,6 +108,7 @@
     <url-pattern>/Logout</url-pattern>
   </servlet-mapping>
 
+<!-- Uncomment this servlet-mapping and the corresponding servlet if ProxyWriter is enabled in portal.properties
   <servlet-mapping>
     <servlet-name>HttpProxyServlet</servlet-name>
     <url-pattern>/servlet/ProxyServlet/*</url-pattern>
@@ -110,6 +113,8 @@
     <servlet-name>HttpProxyServlet</servlet-name>
     <url-pattern>/servlet/ProxyServlet/*</url-pattern>
   </servlet-mapping>
+-->
+  
 
   <servlet-mapping>
     <servlet-name>uPortal</servlet-name>