diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-24 23:31:29 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-24 23:31:29 +0000 |
commit | 68a117d8e2ca53777af1c7bd88d14f5431f64787 (patch) | |
tree | 221b5ffeb34d4245ce1f652472cbc3ffe7039095 /object.c | |
parent | 7d5188a2823801fd48c04be759705454c2bdb9c9 (diff) |
* eval.c (rb_thread_atfork): remove "fork terminates thread"
warning. [ruby-dev:
* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
[ruby-core:02786][ruby-core:03067]
* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
should give us packed address, not struct sockaddr.
[ruby-core:03053]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'object.c')
-rw-r--r-- | object.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -263,7 +263,7 @@ rb_obj_clone(obj) } clone = rb_obj_alloc(rb_obj_class(obj)); RBASIC(clone)->klass = rb_singleton_class_clone(obj); - RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT)) & ~FL_FREEZE; + RBASIC(clone)->flags = (RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT)) & ~(FL_FREEZE|FL_FINALIZE); init_copy(clone, obj); RBASIC(clone)->flags |= RBASIC(obj)->flags & FL_FREEZE; |