Changeset [84ae79de54920fb0d185a7010ab5b5fc71d1385a] by macournoyer
Revision 84ae79de54920fb0d185a7010ab5b5fc71d1385a,
committed by macournoyer
· September 19th, 2015 @ 10:38 AM
Merge branch 'master' into rack2
- master: Update eventmachine dependency version requirements to
be less strict. Update CHANGELOG and bump version to 1.6.4 Check
for Encoding const before using. If an exception object is not
passed to
log_error, ensure thatlog_msgis built anyway. Otherwise, there is no way to log atLogger::ERRORlevel. ignore emacs recovery files in config_path Increase REQUEST_PATH to 2048 symbols
Conflicts:
thin.gemspec
https://github.com/macournoyer/thin/commit/84ae79de54920fb0d185a701...
7 changed files
-
M
CHANGELOG -
M
ext/thin_parser/thin.c -
M
lib/thin/controllers/service.rb -
M
lib/thin/logging.rb -
M
lib/thin/request.rb -
M
lib/thin/version.rb -
M
thin.gemspec