* lib/cgi/core.rb: alias CGI#http_header to CGI#header .

  [Bug #7286]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 6057c99c5d..e6140ad946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov  7 15:34:12 2012  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: alias CGI#http_header to CGI#header.
+
 Wed Nov  7 12:49:39 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* eval.c (rb_mod_refine): set RMODULE_IS_REFINEMENT to a created
diff --git a/NEWS b/NEWS
index b67377ba3e..82f9553bbd 100644
--- a/NEWS
+++ b/NEWS
@@ -254,10 +254,10 @@ with all sufficient information, see the ChangeLog file.
 
 * cgi
   * Add HTML5 tag maker.
-  * incompatible changes:
-    * CGI#header has been renamed to CGI#http_header.
-      CGI#header is now used by the HTML5 tag maker to
-      create a <header> element.
+  * CGI#header has been renamed to CGI#http_header and
+    aliased to CGI#header.
+  * When HTML5 tagmaker called, overwrite CGI#header,
+    CGI#header function is to create a <header> element.
 
 === Language changes
 
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 6a70bb0a70..0ad2ae484f 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -171,6 +171,7 @@ class CGI
       return buf
     end
   end # http_header()
+  alias :header :http_header
 
   def _header_for_string(content_type) #:nodoc:
     buf = ''