1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 55613: [Backport #12575]

* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55924 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2016-08-16 04:43:40 +00:00
parent 89594c0370
commit be4b713d53
3 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Tue Aug 16 13:42:42 2016 Naohisa Goto <ngotogenome@gmail.com>
* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
Tue Aug 16 13:40:26 2016 Eric Wong <e@80x24.org>
* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY

View file

@ -3620,6 +3620,7 @@ rb_wait_for_single_fd(int fd, int events, struct timeval *tv)
fds.events = (short)events;
retry:
fds.revents = 0;
lerrno = 0;
BLOCKING_REGION({
result = ppoll(&fds, 1, timeout, NULL);

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-08-16"
#define RUBY_PATCHLEVEL 352
#define RUBY_PATCHLEVEL 353
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8