From ad5e9cfb6e200a38fbe24908d7d5c10d367754d8 Mon Sep 17 00:00:00 2001
From: ischommer <ischommer@467b73ca-7a2a-4603-9d3b-597d59a354a9>
Date: Thu, 4 Jun 2009 22:03:55 +0000
Subject: [PATCH] BUGFIX Excluding .json extension from RewriteCond in
 .htaccess to allow RestfulServer to work with JSON formats - fixed in
 install.php and rewritetest.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@78433 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 install.php     | 4 ++--
 rewritetest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.php b/install.php
index 7becb45..a930a83 100644
--- a/install.php
+++ b/install.php
@@ -840,7 +840,7 @@ Allow from 127.0.0.1
 
 RewriteEngine On
 $baseClause
-RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)|(\.php$) 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -884,7 +884,7 @@ Allow from 127.0.0.1
 
 RewriteEngine On
 $baseClause
-RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)|(\.php$) 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
diff --git a/rewritetest.php b/rewritetest.php
index 2791863..4fb723e 100644
--- a/rewritetest.php
+++ b/rewritetest.php
@@ -81,7 +81,7 @@ function createHtaccess() {
 RewriteEngine On
 RewriteBase $base
 
-RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)|(\.php$) 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f
@@ -114,7 +114,7 @@ function createHtaccessAlternative() {
 RewriteEngine On
 RewriteBase $base
 
-RewriteCond %{REQUEST_URI} !(\.gif)|(\.jpg)|(\.png)|(\.css)|(\.js)|(\.php)$ 
+RewriteCond %{REQUEST_URI} !(\.gif$)|(\.jpg$)|(\.png$)|(\.css$)|(\.js$)|(\.php$) 
 
 RewriteCond %{REQUEST_URI} ^(.*)$
 RewriteCond %{REQUEST_FILENAME} !-f