Remove .htaccess support.

While useful in ensuring parity between development and production environment
htaccess files have a few problems.

The primary is that they are not univerally supported. The host may have them
disabled for security reasons. Or the application may be hosted where Apache is
not driving PHP. mod_php has security issues on shared host environments so
many hosts are moving to more secure setups (suphp, php-cgi, php + fastcgi). All
these environments scan .user.ini files instead.

I now consider .htaccess part of the deployment config and most apps should
provide a way to accomplish the same needs in a non-.htaccess environemnt.

Author: eric1234

lib/rack/legacy/php.rb

@@ -7,10 +7,9 @@ class Rack::Legacy::Php < Rack::Legacy::Cgi
   # of which executable to use to run the PHP code.
   #
   #  use Rack::Legacy::Php, 'public', 'php5-cgi'
-  def initialize(app, public_dir=FileUtils.pwd, php_exe='php-cgi', htaccess_enabled=true)
+  def initialize(app, public_dir=FileUtils.pwd, php_exe='php-cgi')
     super app, public_dir
     @php_exe = php_exe
-    @htaccess_enabled = htaccess_enabled
   end
 
   # Override to check for php extension. Still checks if
@@ -30,11 +29,6 @@ def valid?(path)
   # Monkeys with the arguments so that it actually runs PHP's cgi
   # program with the path as an argument to that program.
   def run(env, path)
-    config = {'cgi.force_redirect' => 0}
-    config.merge! HtAccess.merge_all(path, public_dir) if @htaccess_enabled
-    config = config.collect {|(key, value)| "#{key}=#{value}"}
-    config.collect! {|kv| ['-d', kv]}
-
     script, info = *path_parts(path)
     if ::File.directory? script
       # If directory then assume index.php
@@ -48,7 +42,7 @@ def run(env, path)
     env['REQUEST_URI'] = strip_public path
     env['REQUEST_URI'] += '?' + env['QUERY_STRING'] if
       env.has_key?('QUERY_STRING') && !env['QUERY_STRING'].empty?
-    super env, @php_exe, *config.flatten
+    super env, @php_exe, "-d cgi.force_redirect=0"
   end
 
   private
@@ -79,46 +73,4 @@ def path_parts(path)
   def info_path(path)
     path.split('.php', 2)[1].to_s
   end
-
-  # For processing .htaccess files to tweak PHP environment.
-  # Represents a single .htaccess file that might affect PHP
-  class HtAccess
-
-    # The .htaccess file being processed
-    attr_reader :file
-
-    # New instance to process the given file for PHP config
-    def initialize(file)
-      @file = file
-    end
-
-    # Returns a hash of the PHP config that needs to be set.
-    def to_hash
-      ret = {}
-      ::File.readlines(@file).each do |line|
-        ret[$1] = $2 if line.chomp =~ /^php_\S+ (\S+) (.*)$/
-      end
-      ret
-    end
-
-    # Will return all .htaccess files that affect a given path
-    # stopping when it reaches the root directory.
-    def self.find_all(path, root)
-      dir = ::File.dirname(path)
-      ret = if dir.start_with?(root)
-        find_all(dir, root)
-      else
-        []
-      end 
-      ret << new("#{dir}/.htaccess") if ::File.exist? "#{dir}/.htaccess"
-      ret
-    end
-
-    # Finds all .htaccess files that affect the given path stopping
-    # at the given root and merge them into one big hash.
-    def self.merge_all(path, root)
-      find_all(path, root).inject({}) {|ret, hsh| ret.merge hsh}
-    end
-
-  end
 end

test/unit/php_test.rb

@@ -96,52 +96,6 @@ def test_environment
     assert 'Rack Legacy', env['SERVER_SOFTWARE']
   end
 
-  def test_parse_htaccess
-    file = File.join(File.dirname(__FILE__), '../fixtures/dir1/dir2/.htaccess')
-    assert_equal({
-      'include_path'      => 'backend:ext:.',
-      'auto_prepend_file' => 'backend/lib/setup.php',
-      'auto_append_file'  => 'backend/lib/teardown.php',
-      'output_buffering'  => 'off',
-    }, Rack::Legacy::Php::HtAccess.new(file).to_hash)
-  end
-
-  def test_htaccess_search
-    file = File.join(File.dirname(__FILE__), '../fixtures/dir1/dir2/test.php')
-    root = File.join(File.dirname(__FILE__), '../fixtures')
-    assert_equal [
-      File.join(File.dirname(__FILE__), '../fixtures/.htaccess'),
-      File.join(File.dirname(__FILE__), '../fixtures/dir1/dir2/.htaccess'),
-    ], Rack::Legacy::Php::HtAccess.find_all(file, root).collect(&:file)
-  end
-
-  def test_merge_all
-    file = File.join(File.dirname(__FILE__), '../fixtures/dir1/dir2/test.php')
-    root = File.join(File.dirname(__FILE__), '../fixtures')
-    assert_equal({
-      'include_path'      => 'backend:ext:.',
-      'auto_prepend_file' => 'backend/lib/setup.php',
-      'auto_append_file'  => 'backend/lib/teardown.php',
-      'output_buffering'  => 'off',
-      'foo'               => 'bar',
-      'baz'               => 'boo',
-    }, Rack::Legacy::Php::HtAccess.merge_all(file, root))
-
-    assert_equal({},
-      Rack::Legacy::Php::HtAccess.merge_all(__FILE__, File.dirname(__FILE__)))
-  end
-
-  def test_htaccess_flag
-    status, headers, body = *app.call({'PATH_INFO' => 'ini.php'})
-    assert_equal '1', body[0]
-
-    app = Rack::Legacy::Php.new \
-      proc {[200, {'Content-Type' => 'text/html'}, 'Endpoint']},
-      File.join(File.dirname(__FILE__), '../fixtures'), 'php-cgi', false
-    status, headers, body = *app.call({'PATH_INFO' => 'ini.php'})
-    assert_equal '4096', body[0]
-  end
-
   private
 
   def app