aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/cgi/core.rb7
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 03deafb5af..cc0c77b005 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 23 02:40:00 2012 Zachary Scott <zachary@zacharyscott.net>
+
+ * lib/cgi/core.rb: Documentation for CGI#header alias
+ Based on a patch by Marcus Stollsteimer
+ [ruby-core:49585] [Bug #7405]
+
Thu Nov 22 23:48:10 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c (is_swept_object): extract from is_dead_object().
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 7044ffa6a0..27137a2032 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -171,6 +171,13 @@ class CGI
return buf
end
end # http_header()
+
+ # This method is an alias for #http_header, when HTML5 tag maker is inactive.
+ #
+ # NOTE: use #http_header to create HTTP header blocks, this alias is only
+ # provided for backwards compatibility.
+ #
+ # Using #header with the HTML5 tag maker will create a <header> element.
alias :header :http_header
def _header_for_string(content_type) #:nodoc: