* gc.c (id2ref): sometimes confused symbol and reference.

* dir.c (glob_helper): breaks loop after calling recusive
  glob_helper; all wild cards should be consumed; no need for
  further match.

* dir.c (dir_s_glob): gives warning if no match found.

* object.c (sym_inspect): did allocate extra byte space.

* marshal.c (shortlen): shortlen should return number of bytes
  written.

* eval.c (ev_const_defined): need not to check if cbase->nd_class
  is rb_cObject.

* eval.c (ev_const_get): ditto.

* time.c (time_zone): return "UTC" for UTC time objects.

* eval.c (THREAD_ALLOC): flags should be initialized.

* signal.c (rb_f_kill): should use FIX2INT, not FIX2UINT.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 0 deletions

diff --git a/time.c b/time.c
index 1b18859bc..a06f1abf2 100644
--- a/time.c
+++ b/time.c
@@ -841,6 +841,9 @@ time_zone(time)
 	time_get_tm(time, tobj->gmt);
     }
 
+    if (tobj->gmt == 1) {
+	return rb_str_new2("UTC");
+    }
 #if defined(HAVE_TM_ZONE)
     return rb_str_new2(tobj->tm.tm_zone);
 #elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT)