Index: cgi/auth.rb
===================================================================
RCS file: /home/akira/cvsroot/ruby/cgiplus/cgi/auth.rb,v
retrieving revision 1.19
diff -u -r1.19 auth.rb
--- cgi/auth.rb	24 Dec 2001 15:21:21 -0000	1.19
+++ cgi/auth.rb	15 Feb 2002 17:27:49 -0000
@@ -510,33 +510,30 @@
 
     def enter_x_session(session, opt, block)
       if block
-        # 与えられたブロックをブラウザに返す。
-        if block
-          @request.out(&block)
+	@request.out(&block)
 
-        else
-          if opt && opt.include?('status') && opt['status'] == 'REDIRECT'
-            # リダイレクトする場合。
-            t = @rs_opt['session_key'] + '=' + rs.session_id
-            if opt.include?('location')
-              if /\?/ =~ opt['location']
-                url = opt['location'] + '&' + t
-              else
-                url = opt['location'] + '?' + t
-              end
+      else
+  	if opt && opt.include?('status') && opt['status'] == 'REDIRECT'
+	  # リダイレクトする場合。
+     	  t = session['session_key'] + '=' + session.session_id
+  	  if opt.include?('location')
+	    if /\?/ =~ opt['location']
+     	      url = opt['location'] + '&' + t
+  	    else
+	      url = opt['location'] + '?' + t
+     	    end
 
-            else
-              if @request.query_string.size > 0
-                url = @request.script_name + '?' + 
-                  @request.query_string + '&' + t
-              else
-                url = @request.script_name + '?' + t
-              end
-            end
-            opt['location'] = url
-          end
-          @request.out(opt, &block)
-        end
+  	  else
+	    if @request.query_string.size > 0
+     	      url = @request.script_name + '?' + 
+  		@request.query_string + '&' + t
+	    else
+     	      url = @request.script_name + '?' + t
+  	    end
+	  end
+     	  opt['location'] = url
+  	end
+	@request.out(opt, &block)
       end
     end
     private :enter_x_session