<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -356,7 +356,12 @@ module ActionController #:nodoc:
 
     # If you are deploying to a subdirectory, you will need to set
     # &lt;tt&gt;config.action_controller.relative_url_root&lt;/tt&gt;
-    class_inheritable_accessor :relative_url_root
+    # This defaults to ENV['RAILS_RELATIVE_URL_ROOT']
+    cattr_writer :relative_url_root
+
+    def self.relative_url_root
+      @@relative_url_root || ENV['RAILS_RELATIVE_URL_ROOT']
+    end
 
     # Holds the request object that's primarily used to get environment variables through access like
     # &lt;tt&gt;request.env[&quot;REQUEST_URI&quot;]&lt;/tt&gt;.</diff>
      <filename>actionpack/lib/action_controller/base.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>11fdcf88c2aea72ec84c5d4ab05986f5d35a9a81</id>
    </parent>
  </parents>
  <author>
    <name>Joshua Peek</name>
    <email>josh@joshpeek.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/f48b9ab5c2741ddbdbc0a9f4cd06875a1e3c8b02</url>
  <id>f48b9ab5c2741ddbdbc0a9f4cd06875a1e3c8b02</id>
  <committed-date>2008-07-24T12:06:22-07:00</committed-date>
  <authored-date>2008-07-24T12:06:22-07:00</authored-date>
  <message>ActionController::Base.relative_url_root falls back to ENV['RAILS_RELATIVE_URL_ROOT']</message>
  <tree>5341ba9bdb9b58cf144a21076945a6563327695b</tree>
  <committer>
    <name>Joshua Peek</name>
    <email>josh@joshpeek.com</email>
  </committer>
</commit>
