tests/test_basic.rb | 2 1 + 1 - 0 !
tests/test_httpclient.rb | 10 5 + 5 - 0 !
tests/test_httpclient2.rb | 6 3 + 3 - 0 !
tests/test_pending_connect_timeout.rb | 2 1 + 1 - 0 !
tests/test_resolver.rb | 8 4 + 4 - 0 !
tests/test_unbind_reason.rb | 2 1 + 1 - 0 !
6 files changed, 15 insertions(+), 15 deletions(-)

 disable tests requiring network connection
 These tests should pass if network access is available
Bug-Debian: http://bugs.debian.org/710941

ext/em.cpp | 54 27 + 27 - 0 !
ext/em.h | 10 5 + 5 - 0 !
tests/test_many_fds.rb | 22 22 + 0 - 0 !
3 files changed, 54 insertions(+), 32 deletions(-)

 [patch 1/3] use ruby select api with expandable fd sets

Conflicts:
	ext/em.h

ext/em.h | 21 21 + 0 - 0 !
1 file changed, 21 insertions(+)

 [patch 2/3] add stubs with warnings for 1.8.7 and 1.9.0

ext/em.h | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 [patch 3/3] add comment about where the macros came from

ext/em.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch 04/11] must call raw select() from thread_blocking_region

ext/em.cpp | 22 11 + 11 - 0 !
1 file changed, 11 insertions(+), 11 deletions(-)

 [patch 05/11] epoll/kqueue on older rubies (without
 rb_wait_for_single_fd) should use rb_thread_select with regular fdset

epoll/kqueue fds are created early during ruby boot, so it is highly
unlikely that they will ever overflow FD_SETSIZE

ext/em.cpp | 6 6 + 0 - 0 !
ext/em.h | 1 1 + 0 - 0 !
2 files changed, 7 insertions(+)

 [patch 06/11] make sure to clean up rb_fd_init memory during shutdown

ext/em.h | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 [patch 07/11] keep build_for_ruby compat

ext/em.cpp | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 [patch 08/11] fix memory leak in _cleanbaddescriptors

ext/em.cpp | 9 7 + 2 - 0 !
1 file changed, 7 insertions(+), 2 deletions(-)

 [patch 09/11] use rb_thread_fd_select whenever possible

Conflicts:
	ext/em.cpp

ext/em.cpp | 2 1 + 1 - 0 !
ext/em.h | 9 7 + 2 - 0 !
ext/extconf.rb | 2 2 + 0 - 0 !
3 files changed, 10 insertions(+), 3 deletions(-)

 [patch 10/11] fix build on ruby 1.9.1

Conflicts:
	ext/extconf.rb

ext/em.cpp | 43 20 + 23 - 0 !
ext/em.h | 3 2 + 1 - 0 !
2 files changed, 22 insertions(+), 24 deletions(-)

 [patch 11/11] allocate one selectdata_t per reactor to avoid heap
 allocation on every tick

Conflicts:
	ext/em.cpp