Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Jul 22, 2014
@rkh rkh Merge pull request #904 from sinatra/hwia-docs-fr
Prefer strings over symbols in French README
8ce3ce5
Yegor Timoschenko Make Sinatra compatible with Tilt 2 e8ea770
Yegor Timoschenko Drop a newline for Ruby 1.8 compatibility e94227e
@rkh rkh Merge pull request #905 from yegortimoschenko/tilt-2-compat
Tilt 2 compat
268de1c
Commits on Jul 24, 2014
@kgrz kgrz Update ShowExceptions to suit latest rack master
* Post 893a2c50 in rack/rack, the #pretty method used while generating
  the HTML error markup, implemented in Rack::ShowExceptions, returns a
  String instead of an Array. This change uses Array() to
  convert the exception string in both plain text and HTML modes
  to an array.
b39d72d
Commits on Jul 27, 2014
@shenqihui shenqihui 进行启动时候绑定参数的说明
-o 参数的说明以及绑定方式。
9184edf
@kytrinyx kytrinyx Merge pull request #908 from shenqihui/patch-1
进行启动时候绑定参数的说明
dcf9b68
Commits on Jul 28, 2014
@tayler1 tayler1 Added date to exception message bbff3d8
@tayler1 tayler1 Fix to show local time instead of GMT 3dbf900
Commits on Aug 04, 2014
@ausmarton ausmarton Prefer strings over symbols in Portuguese (PT and BR) and Spanish README b856b19
@ausmarton ausmarton Prefer strings over symbols in German README 370fd0d
Commits on Aug 05, 2014
@kytrinyx kytrinyx Merge pull request #910 from ausmarton/readme-symbols-to-strings
Prefer strings over symbols in Portuguese, Spanish and German README
a87f433
Commits on Aug 06, 2014
@kami-zh kami-zh Prefer strings over symbols in Japanese README f1a5169
Commits on Aug 11, 2014
@zzak zzak Merge pull request #909 from tayler1/master
Added date to exception message
1add394
@zzak zzak Use default strftime in exception log added in #909 cc385a4
@zzak zzak Merge pull request #911 from kami30k/readme-ja-symbols-to-strings
Prefer strings over symbols in Japanese README [ci skip]
2f8f303
@zzak zzak Merge pull request #897 from markbates/master
Added PROPFIND verb support
68c237d
@zzak zzak Merge pull request #907 from kgrz/fix-error-with-rack-master
Update ShowExceptions to suit latest rack master
a43ba2c
Commits on Aug 12, 2014
@rkh rkh Revert "Added PROPFIND verb support" 28af01e
@rkh rkh Merge pull request #912 from sinatra/revert-897-master
Revert "Added PROPFIND verb support"
fc0c330
Commits on Aug 14, 2014
@vipulnsward vipulnsward Fix docs when printing error from `env['sinatra.error']`.
Fixes #914
8e559c8
@rkh rkh Merge pull request #915 from vipulnsward/fix-error-access
Fix docs when printing error from `env['sinatra.error']`.
79c5e31
Commits on Aug 19, 2014
@wuleicanada wuleicanada Update README.zh.md
README.zh.md: Translation improvements for templates rendering section.
1942f90
Commits on Aug 20, 2014
@kytrinyx kytrinyx Merge pull request #916 from wuleicanada/patch-3
Update README.zh.md
39ce4eb
Commits on Aug 22, 2014
@joshk joshk Use the new Docker queue on Travis
Because I said so!
573c1ee
@rkh rkh Merge pull request #918 from joshk/patch-1
Use the new Docker queue on Travis
0f3e504
Commits on Aug 25, 2014
@7stud 7stud Clarified README.md adde9fd
@kytrinyx kytrinyx Merge pull request #919 from 7stud/improve_readme
Clarified README.md
77438af
Commits on Aug 31, 2014
@vipulnsward vipulnsward Kill empty test. 26a9d44
@zzak zzak Merge pull request #921 from vipulnsward/kill-empty-test
Kill empty test. [ci skip] :trollface:
1f9629b
Commits on Sep 05, 2014
@zzak zzak s/add_charsets/add_charset to fix #923 [ci skip] 2429f38
@zzak zzak Fix encoding issues from 2429f38
Thank you @mattwildig for spotting them! [ci skip]
e33589c
Commits on Sep 09, 2014
@T145 T145 Mildly altered startup prompt 5a40798
Commits on Sep 10, 2014
@kytrinyx kytrinyx Merge pull request #925 from T145/master
Mildly altered startup prompt
7678002
Commits on Sep 11, 2014
@namusyaka namusyaka Change the regex to fix some failed tests 98e879b
@kytrinyx kytrinyx Merge pull request #927 from namusyaka/fix-test
Change the regex to fix some failed tests
6e59749
Commits on Sep 13, 2014
@namusyaka namusyaka Fix broken links about Sinatra Book [ci skip] e446b82
@kytrinyx kytrinyx Merge pull request #928 from namusyaka/fix-broken-links
Fix broken links about Sinatra Book [ci skip]
e9b3110
@burningTyger burningTyger Fix spelling mistake in README.md
/*+_[ci skip]_+*\
cdec024
@burningTyger burningTyger Update for the German README
fan[ci skip]per
2192323
@burningTyger burningTyger fix long lines for README
There are still people who prefer to work in terminals with lines no
longer than 80 chars. [ci skip]
d927b7c
@burningTyger burningTyger Add support for 2.x releases of Ruby to keep it simple
[ci skip]
b9ce061
@burningTyger burningTyger add toc to German Readme
[ci skip]
f3e381c
Commits on Sep 14, 2014
@kytrinyx kytrinyx Merge pull request #929 from burningTyger/master
some updates to the German and English Readmes
e7f65ab
Commits on Sep 19, 2014
@0x203 0x203 exchange rubyforge links in READMEs 2ef02e7
@0x203 0x203 exchange rubyforge links in Base 6ee386b
@rkh rkh Merge pull request #930 from 0x203/master
Replace Rubyforge Links
f7cda5d
Commits on Sep 21, 2014
@rkh rkh Merge pull request #883 from ab/404-xss
Potential for reflected XSS in development mode 404 page
4e92d60
Commits on Nov 15, 2014
@detomastah detomastah Fixed not-working long-polling example
In streaming section, the long polling example first called #body with
Sinatra::Helpers::Stream then again with ["subscribed"].
This resulted in instant rendering of "subscribed" and closing of the
connection.
67fe2d2
Commits on Nov 17, 2014
@rkh rkh Merge pull request #943 from detomastah/fix_error_in_streaming_docs
Fixed incorrect example of long-polling in README
eb1acf2
Commits on Dec 05, 2014
@hakeda hakeda Fix typos and misspellings f1a4fcf
@rkh rkh Merge pull request #946 from hakeda/fix-typos-and-misspellings
Fix typos and misspellings
cef8c93
Commits on Dec 07, 2014
@JonMidhir JonMidhir Expand regex example in Readme 743e3e2
Commits on Dec 08, 2014
@kytrinyx kytrinyx Merge pull request #947 from JonMidhir/issue#917-regex_examples_in_re…
…adme

Expand regex example in Readme
02d42f6
Commits on Dec 15, 2014
@ruben1 ruben1 fix typo
Change uppercase letter to lowercase

Before: El contenido de La plantilla se evalúa como código Ruby

After: El contenido de la plantilla se evalúa como código Ruby
c410bd1
@kytrinyx kytrinyx Merge pull request #949 from ruben1/patch-1
fix typo
7608d29
Commits on Dec 17, 2014
@aderyabin aderyabin fix russian readme bd4aa26
Commits on Dec 18, 2014
@kytrinyx kytrinyx Merge pull request #950 from aderyabin/fix_russian_readme
fix russian readme
6ce8a94
Commits on Jan 01, 2015
@vipulnsward vipulnsward rdoc/rdoc#329 changed page-top link from `documentation` to `top`.
Since we rely on both the rdoc gem and bundled versions, add regex to allow both documentation or top in the result string.
b369e45
@seuros seuros Update travis to test ruby 2.2 224f58e
Commits on Jan 05, 2015
@jeremyevans jeremyevans Fix access to arbitrary .png files on ruby 1.8 e727b17
Commits on Jan 06, 2015
@rkh rkh Merge pull request #956 from jeremyevans/master
Fix access to arbitrary .png files in ruby 1.8 development mode
b8f95af
Commits on Jan 09, 2015
@vipulnsward vipulnsward Fixed test-unit gem dependency on ruby > 2.1 ea0ec6b
@rkh rkh Merge pull request #955 from vipulnsward/fix-rdoc-link-changes
Fix rdoc page-top link matching
e1f4246
@rkh rkh Merge pull request #957 from vipulnsward/fix-dependency-on-2-2
Fixed test-unit gem dependency on ruby > 2.1
2e35e7d
@rkh rkh Merge pull request #954 from seuros/patch-2
Update travis to test ruby 2.2
5f6168b
Commits on Jan 10, 2015
@vipulnsward vipulnsward Get rid of unneeded custom respond_to? implementation which messes wi…
…th test-unit
7a66897
@vipulnsward vipulnsward - Add testing of rack and tilt master against 2.2 4239f51
@vipulnsward vipulnsward - Removed test-unit dependency
- updated minitest to 5.0
- Removed Test::Unit::TestCase and started using Minitest::Test instead
- Fixed usage of assert_raise
- Fixed usage of refute_nil
- Fixed and removed usage of assert_nothing_raised
23c2e19
@vipulnsward vipulnsward - Add minitest dependencies for all rubies 9cd17b5
Commits on Jan 21, 2015
@zzak zzak Merge pull request #958 from vipulnsward/rid-custom-respond-to
Get rid of unneeded custom respond_to? implementation  which messes with test-unit
a9f89b7
@zzak zzak Merge pull request #960 from vipulnsward/remove-unit-test
Remove test-unit and related failures, upgrade test suite to use minitest 5.
62c4456
Commits on Jan 23, 2015
@attilaolah attilaolah Fix grammar
Fix a typo in `README.hu.md`.
237d25d
Commits on Jan 24, 2015
@kytrinyx kytrinyx Merge pull request #966 from attilaolah/patch-2
Fix grammar
27d1716
Commits on Feb 01, 2015
@marocchino marocchino Update Korean README to 23c2e19 8425e16
@kytrinyx kytrinyx Merge pull request #967 from marocchino/ko-readme
Update Korean README to 23c2e19
e45cd2e
Commits on Feb 04, 2015
@davydovanton davydovanton Convert params hash symbols to strings - Russian a402865
@kytrinyx kytrinyx Merge pull request #969 from davydovanton/convert-symbols-to-strings-…
…in-ru-readme

Convert params hash symbols to strings - Russian
1022584
@davydovanton davydovanton Convert symbols to strings in .hu readme 76cb7c6
@davydovanton davydovanton Convert symbols to strings in .ko readme 38763db
@davydovanton davydovanton Convert symbols to strings in .zh readme 6fe76d0
Commits on Feb 05, 2015
@kytrinyx kytrinyx Merge pull request #970 from davydovanton/convert-symbols-to-strings-…
…in-readme

Convert params hash symbols to strings - final
cad128a
@davydovanton davydovanton Replace multiline regexp matchers to string matchers 15f5290
@davydovanton davydovanton Adds a comment to the other regex example ( to russian readme) 2b775c4
Commits on Feb 06, 2015
@zzak zzak Merge pull request #971 from davydovanton/safer-regex-example
Safer regexp in route matching examples [ci skip]
c8814d9
@zzak zzak Merge pull request #959 from vipulnsward/test-rack-master-2-2
Add testing of rack and tilt master against 2.2 [ci skip]
3db409e
@zzak zzak Merge branch 'patch-1' of https://github.com/alexeymuranov/sinatra in…
…to alexeymuranov-patch-1
d224bed
@zzak zzak Merge branch 'alexeymuranov-patch-1' 9929353
Commits on Feb 20, 2015
@npenzin npenzin Update README.ru.md
функционал - очень некорректное слово, для описания функций, это отображение(математики поймут)
fba487d
Commits on Feb 21, 2015
@npenzin npenzin wicked small fix of time_for description 8aa5706
@kytrinyx kytrinyx Merge pull request #975 from npenzin/master
time_for russian description fixed a bit
be9c18a
Commits on Mar 18, 2015
@DyegoCosta DyegoCosta Update Portuguese (Brazil) README 94ed58b
@kytrinyx kytrinyx Merge pull request #983 from DyegoCosta/update-ptbr-readme
Update Portuguese (Brazil) README
911d95a
Commits on Mar 19, 2015
@drbrain drbrain Remove "WEBrick does not support streaming"
WEBrick supports streaming responses since before it was imported into
ruby 1.8.0, probably since it was written.

If Sinatra doesn't support streaming with WEBrick it is a bug in Sinatra
or rack and should be described that way explicitly.

Thanks to @tenderlove for help with the README.ja.md.  All others were
checked in google translate.
a6edad8
Commits on Mar 24, 2015
@zzak zzak Add changelog for 1.4.6 8f008fe
@zzak zzak Update Sinatra to 1.4.6 :tada: b0bd782
@zzak zzak Revert "Correctly handle encoded colons in routes (Fixes #776)"
This reverts commit bd8e07f.
ca5b2f1
@zzak zzak Commit was reverted in ca5b2f1 b186cd5
@zzak zzak 1.4.6 release 9ab6181
@kytrinyx kytrinyx Update changelog to reflect 1.4.6 release fecfce3
@kytrinyx kytrinyx Add an 'upcoming release' section to the changelog 449ce16
@zzak zzak Merge branch 'changelog' #988
Conflicts:
	CHANGES
6ca8c84
@jeremyevans jeremyevans Correctly handle encoded colons in routes (Fixes #776)
This uses a negative lookahead assertion to ensure the colon is
not followed by a character that will make it a key.  In that
case, it should be treated as a literal colon, and handled similar
to other literal special characters.
f763e62
@kytrinyx kytrinyx Add contributing guide
This is essentially a straight copy from the documentation, but
I updated the list of available languages.
2ea4612
@zzak zzak Merge pull request #987 from sinatra/contributing-guide
Add contributing guide
29c51d1
Commits on Apr 05, 2015
@nico-hn nico-hn refactor Base.compile: the handling of path separators at the end is …
…simplified.
21c6327
Commits on Apr 06, 2015
@kytrinyx kytrinyx Merge pull request #992 from nico-hn/refactoring_of_compile
refactor Base.compile
8a366df
@kgrz kgrz Add documentation for Multithreaded modes
Issue: sinatra#941
Discussion: sinatra#937

Although threading depends on the underlying Rack handler, the absence
of any mention of multi-threaded mode/concurrency seems to confuse users
and it was decided to add some pointers to clarify this.
348954c
@nico-hn nico-hn refactor Base.compile: modified the handling of special cases d682c70
Commits on Apr 09, 2015
@DyegoCosta DyegoCosta Add pt-br documentation for Multithreaded modes 6d06f08
@davydovanton davydovanton Add russian documentation for Multithreaded modes [skip ci] 9cad970
@DyegoCosta DyegoCosta Move Multi-threading to Command Line section 1b576ff
@kgrz kgrz Add link under ToC 009a4a5
Commits on Apr 10, 2015
@kytrinyx kytrinyx Merge pull request #995 from davydovanton/rus-multithreaded-modes
Add russian documentation for Multithreaded modes
e2cce2f
@kytrinyx kytrinyx Merge pull request #996 from DyegoCosta/ptbr-multithreaded-mode
Add pt-br documentation for Multithreaded modes
4dbbebc
@kytrinyx kytrinyx Merge pull request #993 from kgrz/add-documentation-for-threaded-modes
Add documentation for Multithreaded modes
6ac6acc
Commits on Apr 11, 2015
@davydovanton davydovanton Add table of contents for russian readme [skip ci] ccff865
Commits on Apr 12, 2015
@kytrinyx kytrinyx Merge pull request #998 from davydovanton/docs-russian-table-contents
Add table of contents for russian readme
0637611
@kytrinyx kytrinyx Add documentation in French about multi-threading. 95d6c14
Commits on Apr 14, 2015
@lucasdavila lucasdavila Fix indentation and increase readability. fbdb319
Commits on Apr 15, 2015
@kytrinyx kytrinyx Merge pull request #999 from lucasdavila/show-exceptions-refactoring
Some refactoring on ShowExceptions class.
0a0957a
Commits on May 01, 2015
@nzwsch nzwsch Add a link to Slack ce37695
Commits on May 02, 2015
@kytrinyx kytrinyx Merge pull request #1000 from nzwsch/patch-1
Added a link to Slack in README
1e14388
@zzak zzak add link to sinatra invite app [ci skip] da493e7
@davydovanton davydovanton Update further reading in russian documentation ec7d1ab
@kytrinyx kytrinyx Merge pull request #1001 from davydovanton/doc-ru-update-further-reading
Update further reading in russian documentation
298466d
Commits on May 23, 2015
@zzak zzak Merge pull request #985 from drbrain/webrick-supports-streaming
Remove "WEBrick does not support streaming"
ddb70dd
@zzak zzak Merge pull request #994 from nico-hn/refactoring_of_compile
refactor Base.compile: modified the handling of special cases
1830563
@zzak zzak Merge pull request #997 from sinatra/fr-multi-threaded
Add documentation in French about multi-threading.
8056ae7
@zzak zzak Move rack master to allowed failures since 2.0.0 development begins 18353f8
Commits on Jun 19, 2015
@zzak zzak Bump Rack to 1.5.x, but not 1.6 since it doesn't work on 1.8.7: 83b06c0
@zzak zzak Don't test Rack 1.4, since we won't use it.
Also don't test Rack master on 1.9.3, since they've dropped support.
099de71
@zzak zzak Add @ag_dubs to sinatra-core :clap: :tada: :confetti_ball: :tada: 41cc794
@zzak zzak Don't test Rack 1.4, since we won't use it.
Also don't test Rack master on 1.9.3, since they've dropped support.
3cade28
Commits on Jun 20, 2015
@zzak zzak Merge pull request #1012 from sinatra/add-ashley
Add @ag_dubs to sinatra-core :clap: :tada: :confetti_ball: :tada:
56dfd23
Commits on Jun 24, 2015
@nzwsch nzwsch Add documentation in Japanese about multi-threading. 7a293df
Commits on Jun 29, 2015
@zzak zzak Merge pull request #1011 from sinatra/bump-rack
Bump Rack to 1.5.x, but not 1.6 since it doesn't work on 1.8.7:
c1ed18e
Commits on Jul 15, 2015
@mig-hub mig-hub Overall french README b10e266
@porras porras Document how to start a multi-threaded server (Spanish) 04c93e1
@kytrinyx kytrinyx Merge pull request #1016 from mig-hub/french-readme
French readme
f9446df
Commits on Jul 20, 2015
@HollowerMan HollowerMan Used URI_INSTANCE unescape method instead of wild unescape function i…
…n the static files path computation
5beba64
Commits on Aug 15, 2015
@kytrinyx kytrinyx Merge pull request #1014 from sinatrasapporo/ja-multi-threaded
Add documentation in Japanese about multi-threading.
973c177
@kytrinyx kytrinyx Merge pull request #1017 from porras/document-multithreading-es
Document how to start a multi-threaded server (Spanish)
f749860
Commits on Aug 23, 2015
@marocchino marocchino Update Korean translation to f749860 62ab7a2
@kytrinyx kytrinyx Merge pull request #1027 from marocchino/update-korean
Update Korean translation to f749860
0827bf9
Commits on Sep 05, 2015
@TrevorBramble TrevorBramble Raise supported/expected dependency versions
Drop Travis testing for Ruby versions lower than 2.2 (or equivalent).
af18cf5
@TrevorBramble TrevorBramble Require JRuby 9k, allow > Rack 1.6 103c2c9
@TrevorBramble TrevorBramble jruby 9k is a real thing now 2c40834
@TrevorBramble TrevorBramble Set minimum Ruby version, update README, add "-alpha" version designa…
…tion
f62011c
@TrevorBramble TrevorBramble Remove tests for pre-1.9 Rubies bebfac5
@TrevorBramble TrevorBramble Drop minimum Ruby version to 2.2.0
Put the baseline at 2.2.0 because Ruby is now using SemVer and any 2.2.x
release should still be compatible.
6e3ccf5
Commits on Sep 10, 2015
@kytrinyx kytrinyx Merge pull request #1018 from HollowerMan/master
Use the URI_INSTANCE.unescape method in static files paths resolution
1d48ab2
Commits on Sep 12, 2015
@kgrz kgrz Remove 1.8 specific handling in `time_for`
Ruby 1.8 didn't support `to_time` method on a Time object, and so there
was custom conversion of Date, DateTime objects to a Time object. This
is no more a problem.
06df8bf
@kgrz kgrz Use `singleton_class` in lieu of class << self 5f1981d
@kgrz kgrz Remove check for availability of URI::Parser
Related Commit: 4a02a75

In the above commit, the URI parser instance was switched based on the
availability of the `Parser` module because Ruby 1.9.2 and above
deprecated the usage of URI::decode in favour of URI::Parser#unescape.

This change removes this switch since this is not required anymore.
d02125e
@kgrz kgrz Revert special char in heredoc fix specific to 1.9.2
This reverts commit 3c99033. It was
made to avoid a syntax error on Ruby 1.9.2. A tick in a heredoc now
doesn't raise an error under Ruby 2.2.0.
1425172
Commits on Sep 13, 2015
@TrevorBramble TrevorBramble Raise Rack version requirement to 2.x 6aea9f8
Commits on Sep 15, 2015
@TrevorBramble TrevorBramble Updated ShowExceptions notification, Rack::File usage fad3619
Commits on Sep 16, 2015
@TrevorBramble TrevorBramble Merge pull request #1036 from kgrz/remove-19-18-specific-workarounds
Remove some 1.9.x 1.8.x specific workarounds
e30e32c
Commits on Sep 20, 2015
@nzwsch nzwsch Remove unnecessary whitespaces d66cfcc
Commits on Sep 21, 2015
@kgrz kgrz Merge pull request #1037 from sinatrasapporo/rm-whitespace
Remove unnecessary whitespaces
52b9a79
Commits on Sep 22, 2015
@JonRowe JonRowe Update README to flag issue with optional routes.
The original example would also match `GET /posts_anything` as `GET /posts` with a format of `"_anything"`
e87e379
Commits on Oct 13, 2015
@davydovanton davydovanton Update russian documentation [skip ci] ee7b66b
@kytrinyx kytrinyx Merge pull request #1039 from davydovanton/doc-rus-readme
Update russian documentation
dcf9263
Commits on Oct 15, 2015
@TrevorBramble TrevorBramble Removed intermediary `path` var in send_file tests
When later referenced, `path` would have a value of the current file,
not the "uploaded" test file. Also, it looked useless?
855208a
Commits on Oct 27, 2015
@koraktor koraktor Minor fixes and improvements to CONTRIBUTING.md
Fixing a few typos, improving the formatting and other improvements.
75c0ece
Commits on Oct 28, 2015
@koraktor koraktor Use "change log" instead of "changelog" 3d97c01
@ashleygwilliams ashleygwilliams Merge pull request #1041 from koraktor/patch-1
Minor fixes and improvements to CONTRIBUTING.md
559a6f7
@Zemmiph0bia Zemmiph0bia Renamed CHANGES -> CHANGELOG, updated rakefile and contributing docum…
…entation
39471d5
@Zemmiph0bia Zemmiph0bia Updated CHANGELOG to use the correct case ae9d3ca
Commits on Oct 29, 2015
@kytrinyx kytrinyx Merge pull request #1043 from Zemmiph0bia/master
change CHANGES to CHANGELOG.md
fabf8ef
@kgrz kgrz Revert 855208a.
This causes conflicts with the way the instance variable `@file` in the
test file works with the scope of `mock_app`. Without assigning the
`@file` instance variable to a temporary variable—in this case `path`—we
won't be able to access the instance var inside the mock_app > get context.
a4dc2ea
Commits on Nov 01, 2015
@kgrz kgrz Use Rack::File#serving method
The API of `Rack::File#serving` has been changed to take two
arguments: `request` and `path` of the file. `Rack::File` would then
interpret the file path based on the root path supplied to it's `#new`
method, and the `path` value passed into the `#serving` method.

This change also sets the root path to the app root path.

This reverts the earlier change to use `Rack::File#call` method because
it appends the route path fragment to the root path provided to
`Rack::File#new` and considers that as the file path for the static
file. Also, it doesn't work with POST requests of static files, which
Sinatra does. So we can't quite use it without modification of the
method.
1a9642b
@kgrz kgrz Rack::File#serving now returns Rack::File::Iterator
Background:
==========

In the `body` Sinatra helper, we DON'T delete the 'Content-Length'
header when:

1. the request is a HEAD request OR
2. If the "value" is a `Rack::File` type OR
3. If the "value" is a `Stream`

where "value" is the argument passed to the `body` helper method. (Refer
sinatra#739 and
sinatra#770)

Post Rack 2.0, the `Rack::File#serving` method now returns a response
array with the second argument of type `Rack::File::Iterator`. This
change breaks this conditional and deletes the `Content-Length` header.
This changes fixes this problem.
1dfae3d
Commits on Dec 02, 2015
@kennym kennym Add DE documentation for Multithreaded modes 70e23a9
@kytrinyx kytrinyx Merge pull request #1051 from kennym/master
Add DE documentation for Multithreaded modes
8035f83
Commits on Dec 03, 2015
@humzashah humzashah extended Helper with Forwardable for delegation
The Helper module was using explicit methods to delegate `session`
and `logger` to `request`. By extending it with Forwardable, this
is now done the proper way i.e. using Ruby's delegation methods.
0c90049
Commits on Dec 04, 2015
@humzashah humzashah explicitly require Forwardable before usage faa38d5
Commits on Dec 25, 2015
@kgrz kgrz Merge pull request #1053 from humzashah/extend-helper-by-forwardable
extended Helper with Forwardable for delegation
886b669
Commits on Dec 28, 2015
@aidewoode aidewoode simplify compile method's code 10f5eaf
Commits on Dec 30, 2015
@namusyaka namusyaka Use Ruby 2.3.0 on Travis b5b2cc5
@kytrinyx kytrinyx Merge pull request #1060 from namusyaka/use-ruby2.3
Use Ruby 2.3.0 on Travis
e09e7f3
Commits on Dec 31, 2015
@aidewoode aidewoode change the code for performance c6d2966
@BenMorganIO BenMorganIO require show_exceptions as default 5993492
@kytrinyx kytrinyx Merge pull request #1059 from aidewoode/simplify-compile-method-code
simplify compile method's code
7610d5f
@kytrinyx kytrinyx Merge pull request #1061 from BenMorganIO/rack-2-support
Rack 2 Support
555d476
Commits on Jan 01, 2016
@aqnouch aqnouch Updated copyright to 2016 a912127
@kytrinyx kytrinyx Merge pull request #1062 from aqnouch/patch-1
Updated copyright to 2016
52bd492
Commits on Jan 07, 2016
@TrevorBramble TrevorBramble Merge pull request #1045 from kgrz/use-rack-files-serving-method
Revert back to Rack::File#serving; use new API
18a6e8a
@TrevorBramble TrevorBramble Merged updates from master, resolving conflicts be69acd
Commits on Jan 17, 2016
@kytrinyx kytrinyx Move @kytrinyx to alumni section of authors list 6cf5e34
@kytrinyx kytrinyx Add @kgrz to Authors file :tada: 713638e
Commits on Jan 18, 2016
@zzak zzak Merge pull request #1065 from sinatra/authors
Move @kytrinyx to alumni section of authors list
e773db5
@zzak zzak Merge pull request #1066 from sinatra/authors-2
Add Kashyap to the AUTHORS.md file
66c1755
Commits on Jan 19, 2016
@pjc0247 pjc0247 Update README.ko.md 3e6aaf9
@codeworm96 codeworm96 Fix some typos in README.md 373d44c
@zzak zzak Merge pull request #1068 from codeworm96/fix_typo
Fix some typos in README.md
246742e
@kgrz kgrz Merge pull request #1067 from pjc0247/patch-1
Update README.ko.md
b14df4a
Commits on Jan 20, 2016
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 8c795b7
Commits on Jan 21, 2016
@kgrz kgrz Merge pull request #1072 from ReadmeCritic/master
Update README URLs based on HTTP redirects
de731a9
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 4599a53
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 06f8cb4
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 6a38649
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects b25ea0f
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 455b49c
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects af6c3ba
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects fa4d3ad
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects b3afc89
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 0c7e4c9
@ReadmeCritic ReadmeCritic Update README URLs based on HTTP redirects 4d99ac8
@ReadmeCritic ReadmeCritic [readme] update DSL link dc650df
@ReadmeCritic ReadmeCritic [readme] update DSL link 3bac917
@ReadmeCritic ReadmeCritic [readme] update HAML File reference 4775eca
@ReadmeCritic ReadmeCritic [readme] update HAML File reference 0ecb33e
@TrevorBramble TrevorBramble Add myself to Current Team 6f9cba9
Commits on Jan 22, 2016
@kgrz kgrz Merge pull request #1074 from ReadmeCritic/patch-1
Update README URLs based on HTTP redirects
f6490a0
@kgrz kgrz Change localhost links to linked representation
This will generate a linked representation for all
`http://localhost:4567` URLs in the README.
eafece0
@fighterleslie fighterleslie Update and polish the Chinese translation (README.zh.md) 792c8d7
Commits on Jan 24, 2016
@zzak zzak Revert "extended Helper with Forwardable for delegation" 5dc5b15
@zzak zzak Merge pull request #1081 from sinatra/revert-1053-extend-helper-by-fo…
…rwardable

Revert "extended Helper with Forwardable for delegation"
e8617b3
@zzak zzak Merge pull request #1069 from fighterleslie/README.zh
Update and polish the Chinese translation (README.zh.md)
5c4abbc
@zzak zzak Merge branch 'add-link-representation-for-localhost-in-readme' of htt…
…ps://github.com/kgrz/sinatra into kgrz-add-link-representation-for-localhost-in-readme
cdeb4d8
@zzak zzak Merge branch 'kgrz-add-link-representation-for-localhost-in-readme' 566f0b8
@zzak zzak Merge pull request #1025 from JonRowe/patch-1
Update README to flag issue with optional routes.
c4c6e2a
@zzak zzak Apply #1025 for translations [ci skip] 866ff85
@zzak zzak Clarify default setting of :static to reflect the Proc
Patch from @mwpastore, closes #1052
bab0355
@zzak zzak Merge branch 'master' into 2.2.0-alpha a0acf42
@zzak zzak Merge pull request #1033 from sinatra/2.2.0-alpha
Sinatra 2.0.0 alpha [redux]
2af9910
@zzak zzak Add CHANGELOG for 1.4.7 5de57e1
@zzak zzak Lock to 2.0 alpha of sinatra b30a718
@zzak zzak Whitelist gem files to avoid packaging "The World" 9871970
@zzak zzak Only test latest 2.2 patch level on travis 7757435
@zzak zzak Add maintenance policy for stable/unstable 8aa43fe
@zzak zzak Add security policy [ci skip] 7ba1d15
@zzak zzak Add new policies to gemspec files [ci skip] f8d4e9b
Commits on Jan 31, 2016
@jsoref jsoref consistently capitalize items d688b5f
@zzak zzak Merge pull request #895 from jeremyevans/error-params
Make route params available during error handler (Fixes #860)
391a3c0
@zzak zzak Add CHANGELOG for #895 [ci skip] cf732f2
@zzak zzak Merge pull request #896 from jeremyevans/not-found-404
Unify not_found and error 404 behavior (Fixes #814)
78dc9d8
@zzak zzak Add changelog for #896 [ci skip] df3d7fd
@zzak zzak Add Reel support.
Closes #793 and #774
e61370a
Commits on Feb 01, 2016
@kgrz kgrz Merge pull request #1087 from jsoref/capitalize
consistently capitalize items
94ba417
@zzak zzak Update rvm before install 655de16
@marshall-lee marshall-lee Enable frozen_string_literal feature. 56a6141
Commits on Feb 02, 2016
@zzak zzak Merge pull request #1076 from marshall-lee/frozen_string_literal
Enable frozen_string_literal feature.
1666dad
@zzak zzak Ensure examples, all lib files, Gemfile and Rakefile are included in …
…package
d6915b1
@kares kares [travis-ci] use a more recent jruby 0567418
@kares kares remove gem 'jruby-openssl' from bundle - not needed for recent JRuby …
…(1.7.x/9K)

bundler seems to be having a hard time installing a recent version and installs an old one
likely caused by the switch to a (-java) platform specified in the jruby-openssl gem
38f0cb9
@kares kares [travis-ci] upgrade jruby to latest (9.0.5.0) eb3036b
@zzak zzak Merge pull request #1091 from kares/green-jruby
a green jruby build
fdd17eb