archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 34033: [Backport #5997]

Browse source 
* thread_pthread.c (rb_thread_create_timer_thread): fix memory
          leak. [ruby-dev:44904] [Bug #5688]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
okkez 2012-02-13 15:29:27 +00:00
parent fada2e46bb
commit cedd050e4d
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Feb 14 00:00:19 2012 okkez <okkez000@gmail.com>
* thread_pthread.c (rb_thread_create_timer_thread): fix memory
leak. [ruby-dev:44904] [Bug #5688]
Fri Feb 9 02:11:19 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* backport r34482 from trunk

1
thread_pthread.c
View file

@ -857,6 +857,7 @@ rb_thread_create_timer_thread(void)
}
native_cond_wait(&timer_thread_cond, &timer_thread_lock);
native_mutex_unlock(&timer_thread_lock);
pthread_attr_destroy(&attr);
}
rb_disable_interrupt(); /* only timer thread recieve signal */
}

6
version.h
View file

@ -1,13 +1,13 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 315
#define RUBY_PATCHLEVEL 316
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2012
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 10
#define RUBY_RELEASE_DATE "2012-02-10"
#define RUBY_RELEASE_DAY 14
#define RUBY_RELEASE_DATE "2012-02-14"
#include "ruby/version.h"