Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
37e3fe5f
Commit
37e3fe5f
authored
Apr 30, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: Fix dyslexic/backward handling of 403/404 errors
parent
9dfbbbcd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
server/fileserver.go
server/fileserver.go
+5
-5
No files found.
server/fileserver.go
View file @
37e3fe5f
...
@@ -42,9 +42,9 @@ func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name st
...
@@ -42,9 +42,9 @@ func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name st
f
,
err
:=
fh
.
root
.
Open
(
name
)
f
,
err
:=
fh
.
root
.
Open
(
name
)
if
err
!=
nil
{
if
err
!=
nil
{
if
os
.
IsNotExist
(
err
)
{
if
os
.
IsNotExist
(
err
)
{
return
http
.
StatusForbidden
,
err
}
else
if
os
.
IsPermission
(
err
)
{
return
http
.
StatusNotFound
,
nil
return
http
.
StatusNotFound
,
nil
}
else
if
os
.
IsPermission
(
err
)
{
return
http
.
StatusForbidden
,
err
}
}
// Likely the server is under load and ran out of file descriptors
// Likely the server is under load and ran out of file descriptors
w
.
Header
()
.
Set
(
"Retry-After"
,
"5"
)
// TODO: 5 seconds enough delay? Or too much?
w
.
Header
()
.
Set
(
"Retry-After"
,
"5"
)
// TODO: 5 seconds enough delay? Or too much?
...
@@ -54,10 +54,10 @@ func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name st
...
@@ -54,10 +54,10 @@ func (fh *fileHandler) serveFile(w http.ResponseWriter, r *http.Request, name st
d
,
err1
:=
f
.
Stat
()
d
,
err1
:=
f
.
Stat
()
if
err1
!=
nil
{
if
err1
!=
nil
{
if
os
.
IsPermission
(
err
)
{
if
os
.
IsNotExist
(
err
)
{
return
http
.
StatusForbidden
,
err
}
else
if
os
.
IsNotExist
(
err
)
{
return
http
.
StatusNotFound
,
nil
return
http
.
StatusNotFound
,
nil
}
else
if
os
.
IsPermission
(
err
)
{
return
http
.
StatusForbidden
,
err
}
}
// Return a different status code than above so as to distinguish these cases
// Return a different status code than above so as to distinguish these cases
return
http
.
StatusInternalServerError
,
err
return
http
.
StatusInternalServerError
,
err
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment