dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4228 from jekyll/pull/fix-file-edge-servlet 

Fix an edge where file is sometimes not returned properly.
This commit is contained in:
Jordon Bedwell 2015-12-05 04:53:47 -06:00
parent 79ceb4d394 b63712e403
commit 68d58f4183
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jekyll/commands/serve/servlet.rb
View File

@ -18,24 +18,26 @@ module Jekyll
return super return super
end end
# ---------------------------------------------------------------------
# file > file/index.html > file.html > directory -> Having a directory # file > file/index.html > file.html > directory -> Having a directory
# with the same name as a file will result in the file being served the # with the same name as a file will result in the file being served the way
# way that Nginx behaves (probably not exactly...) For browsing. # that Nginx behaves (probably not exactly...) For browsing.
# ---------------------------------------------------------------------
def search_file(req, res, basename) def search_file(req, res, basename)
return file if (file = super) || (file = super req, res, "#{basename}.html") file = super || super(req, res, "#{basename}.html")
return file if file
file = "#{req.path.gsub(/\/\Z/, "")}.html" file = "#{req.path.gsub(/\/\Z/, "")}.html"
if file && File.file?(File.join(@config[:DocumentRoot], file)) if file && File.file?(File.join(@config[:DocumentRoot], file))
return ".html" return ".html"
end end
nil nil
end end
def extract_headers(opts) def extract_headers(opts)
@headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", {})) @headers = add_defaults(opts.fetch("webrick", {}).fetch("headers", {
# Nothing.
}))
end end
def add_defaults(opts) def add_defaults(opts)