Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git@github.com:riham/eventmachine

Conflicts:

	lib/eventmachine.rb
  • Loading branch information...
commit aa777cf81a701d4aac934be58e60416e9e724819 2 parents e0ba3bc + a863279
Riham authored
Showing with 2 additions and 3 deletions.
  1. +1 −1  ext/em.cpp
  2. +1 −2  lib/eventmachine.rb
View
2  ext/em.cpp
@@ -1338,7 +1338,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
goto fail;
}
- if (listen (sd_accept, 200)) {
+ if (listen (sd_accept, 100)) {
//__warning ("listen failed");
goto fail;
}
View
3  lib/eventmachine.rb
@@ -254,7 +254,7 @@ def EventMachine::run_without_threads &block
EventMachine::run(&block)
end
- # #add a no-op implementation to epoll
+ # add a no-op implementation to epoll
def EventMachine::epoll
end
@@ -297,7 +297,6 @@ def EventMachine::epoll
#--
# Changed 04Oct06: We now pass the interval as an integer number of milliseconds.
#
-
def EventMachine::add_timer *args, &block
interval = args.shift
code = args.shift || block
Please sign in to comment.
Something went wrong with that request. Please try again.