<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -34,7 +34,7 @@ module Merb
       @route_params = {}
     end
     
-    METHODS = %w{get post put delete head}
+    METHODS = %w{get post put delete head options}
 
     # ==== Returns
     # Symbol:: The name of the request method, e.g. :get.
@@ -48,7 +48,7 @@ module Merb
       @method ||= begin
         request_method = @env['REQUEST_METHOD'].downcase.to_sym
         case request_method
-        when :get, :head, :put, :delete
+        when :get, :head, :put, :delete, :options
           request_method
         when :post
           m = nil</diff>
      <filename>lib/merb-core/dispatch/request.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>176857bb339f6b5dbbcbbe03dcbb7ba10184d64d</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@yehuda-katzs-macbook-pro.local</email>
  </author>
  <url>http://github.com/wycats/merb-core/commit/c019974cb103ca21722fe18c12872c50669a2ea3</url>
  <id>c019974cb103ca21722fe18c12872c50669a2ea3</id>
  <committed-date>2008-07-17T03:17:26-07:00</committed-date>
  <authored-date>2008-07-17T03:17:26-07:00</authored-date>
  <message>Add support for OPTIONS</message>
  <tree>3520111a7e507b4468ec656daf7e0e461ea0fa6c</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@yehuda-katzs-macbook-pro.local</email>
  </committer>
</commit>
