[DRE-commits] [ruby-rack] 03/10: Merge branch 'upstream-1.4' into master-1.4

[Antonio Terceiro]

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

terceiro pushed a commit to branch master-1.4
in repository ruby-rack.

commit 76546bc659ec77606324939c7b0355764b69eeb2
Merge: 8394c18 bba423c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Oct 20 12:50:39 2013 -0300

    Merge branch 'upstream-1.4' into master-1.4
    
    For some reason there were debian/* files in the existing upstream
    branch and I had to solve the conflicts.
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules
    	debian/watch

 .gitignore                           |   10 +
 .travis.yml                          |   19 ++
 COPYING                              |    2 +-
 KNOWN-ISSUES                         |    9 +
 README.rdoc                          |  112 ++++++++-
 Rakefile                             |   29 ++-
 SPEC                                 |    4 +-
 contrib/rack.png                     |  Bin 0 -> 23805 bytes
 contrib/rack.svg                     |  150 +++++++++++++
 contrib/rdoc.css                     |  412 ++++++++++++++++++++++++++++++++++
 lib/rack.rb                          |   12 +
 lib/rack/auth/abstract/request.rb    |    6 +-
 lib/rack/auth/basic.rb               |    2 +-
 lib/rack/auth/digest/nonce.rb        |    2 +-
 lib/rack/backports/uri/common_18.rb  |   42 ++--
 lib/rack/backports/uri/common_192.rb |   31 ++-
 lib/rack/backports/uri/common_193.rb |   29 +++
 lib/rack/body_proxy.rb               |   10 +
 lib/rack/builder.rb                  |    2 +-
 lib/rack/cascade.rb                  |   11 +
 lib/rack/commonlogger.rb             |   23 +-
 lib/rack/deflater.rb                 |    6 +-
 lib/rack/directory.rb                |    2 +-
 lib/rack/etag.rb                     |    9 +-
 lib/rack/file.rb                     |   34 +--
 lib/rack/head.rb                     |    1 +
 lib/rack/lint.rb                     |    4 +-
 lib/rack/lock.rb                     |    7 +-
 lib/rack/mime.rb                     |    2 +-
 lib/rack/mock.rb                     |    5 +-
 lib/rack/multipart.rb                |    4 +-
 lib/rack/multipart/parser.rb         |   23 +-
 lib/rack/reloader.rb                 |    2 +-
 lib/rack/request.rb                  |    6 +-
 lib/rack/response.rb                 |    3 +-
 lib/rack/server.rb                   |   30 ++-
 lib/rack/session/abstract/id.rb      |    5 +
 lib/rack/session/cookie.rb           |   11 +-
 lib/rack/static.rb                   |   98 +++++++-
 lib/rack/utils.rb                    |   38 +++-
 metadata.yml                         |  364 ------------------------------
 rack.gemspec                         |    6 +-
 test/builder/line.ru                 |    1 +
 test/cgi/assets/folder/test.js       |    1 +
 test/cgi/assets/fonts/font.eot       |    1 +
 test/cgi/assets/images/image.png     |    1 +
 test/cgi/assets/index.html           |    1 +
 test/cgi/assets/javascripts/app.js   |    1 +
 test/cgi/assets/stylesheets/app.css  |    1 +
 test/rackup/.gitignore               |    1 +
 test/spec_auth.rb                    |   57 +++++
 test/spec_auth_basic.rb              |    8 +
 test/spec_auth_digest.rb             |   14 ++
 test/spec_body_proxy.rb              |    4 +
 test/spec_builder.rb                 |    8 +-
 test/spec_cascade.rb                 |    8 +
 test/spec_chunked.rb                 |   12 +-
 test/spec_config.rb                  |    1 -
 test/spec_content_length.rb          |   39 ++--
 test/spec_content_type.rb            |   20 +-
 test/spec_deflater.rb                |   52 +++--
 test/spec_directory.rb               |   21 +-
 test/spec_etag.rb                    |   42 ++--
 test/spec_file.rb                    |   67 +++---
 test/spec_head.rb                    |   32 ++-
 test/spec_lobster.rb                 |   25 ++-
 test/spec_lock.rb                    |   67 ++++--
 test/spec_logger.rb                  |    9 +-
 test/spec_methodoverride.rb          |   43 ++--
 test/spec_mock.rb                    |   19 +-
 test/spec_multipart.rb               |   82 +++++++
 test/spec_nulllogger.rb              |   15 +-
 test/spec_recursive.rb               |   21 +-
 test/spec_request.rb                 |    4 +-
 test/spec_response.rb                |   30 +++
 test/spec_runtime.rb                 |   20 +-
 test/spec_sendfile.rb                |   22 +-
 test/spec_server.rb                  |   47 ++++
 test/spec_session_cookie.rb          |   69 +++++-
 test/spec_session_memcache.rb        |   18 +-
 test/spec_session_pool.rb            |   23 +-
 test/spec_showexceptions.rb          |   13 +-
 test/spec_showstatus.rb              |   15 +-
 test/spec_static.rb                  |   94 +++++++-
 test/spec_urlmap.rb                  |   20 +-
 test/spec_utils.rb                   |   20 +-
 test/static/another/index.html       |    1 +
 87 files changed, 1916 insertions(+), 731 deletions(-)

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