<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>merb-gen/app_generators/merb/templates/public/.htaccess</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,4 +1,23 @@
 #!/usr/bin/env ruby
-
-argv = ARGV + %w[-a fcgi]
+                                                               
+require 'rubygems'
+require 'merb-core'
+                   
+# If the fcgi process runs as apache, make sure
+# we have an inlinedir set
+unless ENV[&quot;INLINEDIR&quot;] || ENV[&quot;HOME&quot;]
+  tmpdir = File.dirname(__FILE__) + &quot;/../tmp&quot;
+  unless File.directory?(tmpdir)
+    Dir.mkdir(tmpdir)
+  end                
+  
+  ENV[&quot;INLINEDIR&quot;] = tmpdir
+  
+end
+                              
+# the merb root should alwasy be located below
+# to set the root dir
+argv = ARGV + %w[-a fcgi -m ..]               
+                     
+# start
 Merb.start(argv)
\ No newline at end of file</diff>
      <filename>merb-gen/app_generators/merb/templates/public/merb.fcgi</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>df04185c17e981aa4c7f86b5a7e21e74aafc3ce9</id>
    </parent>
  </parents>
  <author>
    <name>Martin Grund</name>
    <email>grund@MacGrund.local</email>
  </author>
  <url>http://github.com/wycats/merb-more/commit/3a13dac3bfdb4e37d20095e254f36437fcf0cc84</url>
  <id>3a13dac3bfdb4e37d20095e254f36437fcf0cc84</id>
  <committed-date>2008-03-24T16:15:03-07:00</committed-date>
  <authored-date>2008-03-24T10:44:22-07:00</authored-date>
  <message>* adds implementation for #220 * modifies merb.fcgi to enable really working with fcgi setups * adds default .htaccess that manages the redirection to the CGI script

Signed-off-by: Ezra Zygmuntowicz &lt;ez@engineyard.com&gt;</message>
  <tree>08a3e1101c6437f8d5bb6bc774b0c0caf8cf1f2c</tree>
  <committer>
    <name>Ezra Zygmuntowicz</name>
    <email>ez@engineyard.com</email>
  </committer>
</commit>
