From: dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 24 Jan 2008 03:18:56 +0000 (+0000)
Subject: Do not force application type of XHTML files to XUL (wreaks havoc with javascript)
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ed5235ec7c9280cd324a9b118cff6038dfcdab83;p=Evergreen.git

Do not force application type of XHTML files to XUL (wreaks havoc with javascript)


git-svn-id: svn://svn.open-ils.org/ILS/trunk@8488 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 6128cfa477..ff6b22f0bb 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -101,16 +101,26 @@ OSRFGatewayConfig /openils/conf/opensrf_core.xml
 # ----------------------------------------------------------------------------------
 # Run server-side XUL and XHTML through xmlent to load the correct XML entities
 # ----------------------------------------------------------------------------------
-<LocationMatch /xul/.*(\.xul|\.xhtml)$>
+<LocationMatch /xul/.*\.xhtml$>
+    Options +Includes
+    AddOutputFilter INCLUDES;XMLENT .xhtml
+    allow from all
+
+    # We only support one locale (en-US) for the time being
+    SetEnv locale en-US
+</LocationMatch>
+
+<LocationMatch /xul/.*\.xul$>
     Options +Includes
     XMLEntContentType "application/vnd.mozilla.xul+xml"
-    AddOutputFilter INCLUDES;XMLENT .xhtml .xul
+    AddOutputFilter INCLUDES;XMLENT .xul
     allow from all
 
     # We only support one locale (en-US) for the time being
     SetEnv locale en-US
 </LocationMatch>
 
+
 # ----------------------------------------------------------------------------------
 # Supercat feeds
 # ----------------------------------------------------------------------------------