[DRE-commits] [ruby-eventmachine] 02/06: Merge tag 'upstream/1.0.7'

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-eventmachine.

commit d2bc0ba431b36dbec65a893053b46f1279fe385b
Merge: 0b6de01 08235b6
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Apr 9 15:43:48 2015 +0200

    Merge tag 'upstream/1.0.7'
    
    Upstream version 1.0.7
    
    # gpg: Signature made Don 09 Apr 2015 15:43:45 CEST using RSA key ID 93052E03
    # gpg: Good signature from "Christian Hofstaedtler <christian at hofstaedtler.name>"
    # gpg:                 aka "Christian Hofstaedtler <ch at zeha.at>"
    # gpg:                 aka "Christian Hofstaedtler <zeha at debian.org>"

 .travis.yml                                        |  20 +-
 CHANGELOG.md                                       |  53 +++-
 README.md                                          |   9 +-
 eventmachine.gemspec                               |   2 +
 ext/binder.cpp                                     |   2 +-
 ext/cmain.cpp                                      |  33 ++-
 ext/ed.cpp                                         |  52 +++-
 ext/ed.h                                           |  10 +-
 ext/em.cpp                                         | 270 +++++++++++++--------
 ext/em.h                                           |  56 ++++-
 ext/eventmachine.h                                 |   3 +
 ext/extconf.rb                                     |  24 +-
 ext/fastfilereader/extconf.rb                      |   5 +-
 ext/fastfilereader/mapper.cpp                      |   2 +-
 ext/project.h                                      |  15 +-
 ext/rubymain.cpp                                   |  61 ++++-
 ext/ssl.cpp                                        |   5 +-
 ext/ssl.h                                          |   4 +
 java/src/com/rubyeventmachine/EmReactor.java       |  16 ++
 .../src/com/rubyeventmachine/EventableChannel.java |   2 +
 .../rubyeventmachine/EventableDatagramChannel.java |   6 +
 .../rubyeventmachine/EventableSocketChannel.java   |  65 ++++-
 lib/em/buftok.rb                                   | 119 +++------
 lib/em/connection.rb                               |   2 +-
 lib/em/iterator.rb                                 |  49 +---
 lib/em/protocols/httpclient.rb                     |  42 +++-
 lib/em/protocols/line_and_text.rb                  |   5 +-
 lib/em/protocols/linetext2.rb                      |   1 -
 lib/em/protocols/smtpserver.rb                     |  41 +++-
 lib/em/pure_ruby.rb                                |   4 +-
 lib/em/resolver.rb                                 |  19 +-
 lib/em/tick_loop.rb                                |  38 +--
 lib/em/version.rb                                  |   2 +-
 lib/eventmachine.rb                                |  29 ++-
 lib/jeventmachine.rb                               |  17 ++
 metadata.yml                                       | 169 +++++++------
 rakelib/package.rake                               |  11 +-
 tests/em_test_helper.rb                            |   4 +
 tests/test_attach.rb                               |  25 ++
 tests/test_basic.rb                                |  30 ++-
 tests/test_completion.rb                           |   1 +
 tests/test_connection_count.rb                     |  23 +-
 tests/test_connection_write.rb                     |  35 +++
 tests/test_epoll.rb                                |  40 +--
 tests/test_httpclient.rb                           |  43 ++++
 tests/test_idle_connection.rb                      |  10 +-
 tests/test_iterator.rb                             |  97 ++++++++
 tests/test_kb.rb                                   |  44 ++--
 tests/test_many_fds.rb                             |  22 ++
 tests/test_pause.rb                                |  29 +++
 tests/test_pool.rb                                 |   2 +
 tests/test_process_watch.rb                        |   2 +
 tests/test_processes.rb                            |  14 +-
 tests/test_resolver.rb                             |  40 ++-
 tests/test_ssl_args.rb                             |   4 +-
 tests/test_ssl_methods.rb                          |   8 +-
 tests/test_ssl_verify.rb                           | 124 +++++-----
 tests/test_threaded_resource.rb                    |   8 +
 58 files changed, 1285 insertions(+), 583 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-eventmachine.git