From 11a0e8db6ba04160ba6d9794ac53e121320a08b0 Mon Sep 17 00:00:00 2001
From: Ned <nedcampion@gmail.com>
Date: Mon, 19 Mar 2012 17:25:02 -0400
Subject: [PATCH 1/3] testing if 'claimed_id mismatch' is an issue on heroky +
 ssl

---
 lib/openid/consumer/idres.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/openid/consumer/idres.rb b/lib/openid/consumer/idres.rb
index 8ef9e384..6d3964e9 100644
--- a/lib/openid/consumer/idres.rb
+++ b/lib/openid/consumer/idres.rb
@@ -492,12 +492,6 @@ def verify_discovery_single(endpoint, to_match)
                                 "#{endpoint.claimed_id}")
         end
 
-        if to_match.get_local_id != endpoint.get_local_id
-          raise ProtocolError, ("local_id mismatch. Expected "\
-                                "#{to_match.get_local_id}, got "\
-                                "#{endpoint.get_local_id}")
-        end
-
         # If the server URL is nil, this must be an OpenID 1
         # response, because op_endpoint is a required parameter in
         # OpenID 2. In that case, we don't actually care what the
@@ -512,7 +506,7 @@ def verify_discovery_single(endpoint, to_match)
             "`to_match' endpoint."
           end
         elsif to_match.server_url != endpoint.server_url
-          raise ProtocolError, ("OP Endpoint mismatch. Expected"\
+          raise ProtocolError, ("OP Endpoint mismatch. Expected "\
                                 "#{to_match.server_url}, got "\
                                 "#{endpoint.server_url}")
         end

From cd3e19ca0ce24d63ebe15aa3630c2912b12a1e1d Mon Sep 17 00:00:00 2001
From: Ned <nedcampion@gmail.com>
Date: Mon, 19 Mar 2012 17:25:32 -0400
Subject: [PATCH 2/3] update readme

---
 README | 82 +---------------------------------------------------------
 1 file changed, 1 insertion(+), 81 deletions(-)

diff --git a/README b/README
index 2abba7e7..eadf83ec 100644
--- a/README
+++ b/README
@@ -1,81 +1 @@
-=Ruby OpenID
-
-A Ruby library for verifying and serving OpenID identities.
-
-==Features
-* Easy to use API for verifying OpenID identites - OpenID::Consumer
-* Support for serving OpenID identites - OpenID::Server
-* Does not depend on underlying web framework
-* Supports multiple storage mechanisms (Filesystem, ActiveRecord, Memory)
-* Example code to help you get started, including:
-  * Ruby on Rails based consumer and server
-  * OpenIDLoginGenerator for quickly getting creating a rails app that uses
-    OpenID for authentication
-  * ActiveRecordOpenIDStore plugin
-* Comprehensive test suite
-* Supports both OpenID 1 and OpenID 2 transparently
-
-==Installing
-Before running the examples or writing your own code you'll need to install
-the library.  See the INSTALL file or use rubygems:
-
-  gem install ruby-openid
-  
-Check the installation:
-  
-  $ irb
-  irb> require 'rubygems'
-  irb> require_gem 'ruby-openid'
-  => true
-
-The library is known to work with Ruby 1.8.4 on Unix, Max OSX and
-Win32.  Examples have been tested with Rails 1.1 and 1.2, and 2.0.
-
-==Getting Started
-The best way to start is to look at the rails_openid example.
-You can run it with:
- cd examples/rails_openid
- script/server
-
-If you are writing an OpenID Relying Party, a good place to start is:
-examples/rails_openid/app/controllers/consumer_controller.rb
-
-And if you are writing an OpenID provider:
-examples/rails_openid/app/controllers/server_controller.rb
-
-The library code is quite well documented, so don't be squeamish, and
-look at the library itself if there's anything you don't understand in
-the examples.
-
-==Homepage
-http://github.com/openid/ruby-openid
-
-See also:
-http://openid.net/
-
-==Community
-Discussion regarding the Ruby OpenID library and other JanRain OpenID
-libraries takes place on the the OpenID mailing list on
-openid.net.
-
-http://openid.net/developers/dev-mailing-lists/
-
-Please join this list to discuss, ask implementation questions, report
-bugs, etc.  Also check out the openid channel on the freenode IRC
-network.
-
-If you have a bugfix or feature you'd like to contribute, don't
-hesitate to send it to us.  For more detailed information on how to
-contribute, see
-
-  http://openidenabled.com/contribute/
-
-==Author
-Copyright 2006-2008, JanRain, Inc.
-
-Contact openid@janrain.com or visit the OpenID channel on pibb.com:
-
-http://pibb.com/go/openid
-
-==License
-Apache Software License.  For more information see the LICENSE file.
+This is fork for experimental debugging purposes only ... you've been warned.
\ No newline at end of file

From 7134b6c8d187e7d58add85bc7be8cdb31c6a3729 Mon Sep 17 00:00:00 2001
From: Graham Siener <siener@gmail.com>
Date: Thu, 22 Mar 2012 16:40:26 -0400
Subject: [PATCH 3/3] commenting out line per GH issue #1

---
 lib/openid/consumer/checkid_request.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/openid/consumer/checkid_request.rb b/lib/openid/consumer/checkid_request.rb
index eb5d3979..c4295440 100644
--- a/lib/openid/consumer/checkid_request.rb
+++ b/lib/openid/consumer/checkid_request.rb
@@ -122,7 +122,8 @@ def get_message(realm, return_to=nil, immediate=false)
         end
 
         if @assoc
-          message.set_arg(OPENID_NS, 'assoc_handle', @assoc.handle)
+          # commenting this per GH issue #1 https://github.com/openid/ruby-openid/issues/1
+          #message.set_arg(OPENID_NS, 'assoc_handle', @assoc.handle)
           assoc_log_msg = "with assocication #{@assoc.handle}"
         else
           assoc_log_msg = 'using stateless mode.'