diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl index 653a368d30..7d450c41b0 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/wiki/pagelist.get.rss.ftl @@ -10,7 +10,7 @@ Alfresco - Wiki Page Recent Changes ${absurl(url.context)?replace("alfresco", "share/proxy/alfresco")}/images/logo/AlfrescoLogo200.png - <#list pageList.pages?sort_by(['modified'])?reverse as p> + <#list wiki.pages?sort_by(['modified'])?reverse as p> <#assign page = p.page> ${page.properties.title!""?html} diff --git a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java index d76519d712..ed305e184d 100644 --- a/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java +++ b/source/java/org/alfresco/repo/webdav/auth/BaseNTLMAuthenticationFilter.java @@ -318,8 +318,8 @@ public abstract class BaseNTLMAuthenticationFilter extends BaseSSOAuthentication if (getLogger().isDebugEnabled()) getLogger().debug("New NTLM auth request from " + req.getRemoteHost() + " (" + - req.getRemoteAddr() + ":" + req.getRemotePort() + ")"); - + req.getRemoteAddr() + ":" + req.getRemotePort() + ") SID:" + req.getSession().getId()); + // Send back a request for NTLM authentication restartLoginChallenge(resp, httpSess); }