Merge branch 'master' of https://github.com/needto/omniauth

oa-enterprise/lib/omniauth/strategies/cas/service_ticket_validator.rb

@@ -68,7 +68,7 @@ def get_service_response_body
           http = Net::HTTP.new(@uri.host, @uri.port)
           http.use_ssl = @uri.port == 443 || @uri.instance_of?(URI::HTTPS)
           http.start do |c|
-            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS
+            response = c.get "#{@uri.path}?#{@uri.query}", VALIDATION_REQUEST_HEADERS.dup
             result = response.body
           end
           result

oa-enterprise/spec/omniauth/strategies/cas_spec.rb

@@ -72,4 +72,23 @@ def strategy
       last_response.body.should == 'true'
     end
   end
+
+  unless RUBY_VERSION =~ /^1\.8\.\d$/
+    describe 'GET /auth/cas/callback with a valid ticket and gzipped response from the server on ruby >1.8' do
+      before do
+        zipped = StringIO.new
+        Zlib::GzipWriter.wrap zipped do |io|
+          io.write File.read(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'cas_success.xml'))
+        end
+        stub_request(:get, /^https:\/\/cas.example.org(:443)?\/serviceValidate\?([^&]+&)?ticket=593af/).
+           with { |request| @request_uri = request.uri.to_s }.
+           to_return(:body => zipped.string, :headers => { 'content-encoding' => 'gzip' })
+        get '/auth/cas/callback?ticket=593af'
+      end
+
+      it 'should call through to the master app when response is gzipped' do     
+          last_response.body.should == 'true' 
+      end
+    end
+  end
 end