Skip to content

添加对//xx的支持 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

添加对//xx的支持 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4d5dba
filter slash in path
Sep 29, 2015
e86996f
filter slash in path
Sep 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/hello.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"fmt"
"github.com/justintan/gox"
"github.com/justintan/wine"
"time"
"github.com/shanks-hongfa/wine"
)

func main() {
Expand Down
14 changes: 13 additions & 1 deletion path.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package wine

import "strings"
import (
"strings"
"regexp"
)

func cleanPath(path string) string {
if path == "" {
Expand All @@ -24,3 +27,12 @@ func cleanPath(path string) string {

return path
}

//过滤`//`
func filterSlashPath(path string) string{
if path == ""{
return "/"
}
re, _ := regexp.Compile("/{2,}")
return re.ReplaceAllString(path,"/")
}
2 changes: 1 addition & 1 deletion server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (this *server) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
if i > 0 {
path = req.RequestURI[:i]
}
path=cleanPath(path)
path=filterSlashPath(path)
handlers, params := this.Match(req.Method, path)
if len(handlers) == 0 {
gox.LError("Not found", path, "[", req.RequestURI, "]")
Expand Down