Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomo Ala-Vannesluoma <tuomoav@gmail.com>2018-10-02 19:16:34 +0300
committerTuomo Ala-Vannesluoma <tuomoav@gmail.com>2018-10-02 19:16:34 +0300
commit934846801003e59e006d8ca47d985c6102bc93aa (patch)
tree9d7edeb8dc243c037d0d3718664f5871ba6f1c2a /internal/domain
parentc84c03d5fecb2214fe8fb43ad740ccf37a967990 (diff)
Fix comparing the domain and log request information as well. Removed invalid comment and fixed one else case.
Diffstat (limited to 'internal/domain')
-rw-r--r--internal/domain/domain.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/domain/domain.go b/internal/domain/domain.go
index a402d9e0..c9bda506 100644
--- a/internal/domain/domain.go
+++ b/internal/domain/domain.go
@@ -372,7 +372,6 @@ func (d *D) serveFileFromGroup(w http.ResponseWriter, r *http.Request) bool {
}
func (d *D) serveNotFoundFromGroup(w http.ResponseWriter, r *http.Request) {
- // The Path always contains "/" at the beginning
project, projectName, _ := d.getProjectWithSubpath(r)
if project == nil {
httperrors.Serve404(w)
@@ -447,9 +446,9 @@ func (d *D) ServeNotFoundHTTP(w http.ResponseWriter, r *http.Request) {
if d.config != nil {
d.serveNotFoundFromConfig(w, r)
+ } else {
+ d.serveNotFoundFromGroup(w, r)
}
-
- d.serveNotFoundFromGroup(w, r)
}
func endsWithSlash(path string) bool {