[open-ils-commits] r8488 - trunk/Open-ILS/examples/apache

[svn at svn.open-ils.org]

Author: dbs
Date: 2008-01-23 22:18:56 -0500 (Wed, 23 Jan 2008)
New Revision: 8488

Modified:
   trunk/Open-ILS/examples/apache/eg_vhost.conf
Log:
Do not force application type of XHTML files to XUL (wreaks havoc with javascript)


Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-01-23 21:24:48 UTC (rev 8487)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf	2008-01-24 03:18:56 UTC (rev 8488)
@@ -101,16 +101,26 @@
 # ----------------------------------------------------------------------------------
 # 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
 # ----------------------------------------------------------------------------------