aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-23 22:42:12 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-23 22:42:12 +0000
commitd212a89c380683490dc735c770855f08391540a1 (patch)
tree0eb04c7bdd7b54d88886b861a965ef6ed25054ae
parentba475e4415736d50548c8ce42fbab7e67f740a35 (diff)
downloadruby-d212a89c380683490dc735c770855f08391540a1.tar.gz
* lib/net/http/backward.rb (class Net): Restored Net::HTTPSession to
fix backwards-compatibility with ancient Net::HTTP. [Bug #6889] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http/backward.rb5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ffcf61ba44..b710091d25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 24 07:35:24 2012 Eric Hodel <drbrain@segment7.net>
+
+ * lib/net/http/backward.rb (class Net): Restored Net::HTTPSession to
+ fix backwards-compatibility with ancient Net::HTTP. [Bug #6889]
+
Thu Aug 23 20:58:55 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* common.mk: support `make id.h` without `rm .id.h.time` after
diff --git a/lib/net/http/backward.rb b/lib/net/http/backward.rb
index 7ffaac77d1..faf47b8489 100644
--- a/lib/net/http/backward.rb
+++ b/lib/net/http/backward.rb
@@ -4,7 +4,10 @@
class Net::HTTP
ProxyMod = ProxyDelta
- HTTPSession = self
+end
+
+module Net
+ HTTPSession = Net::HTTP
end
module Net::NetPrivate