beenull/linx-server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #112 from mutantmonkey/issue_111

Browse source 
Fix max expiry when provided expiry is 0
This commit is contained in:
Andrei Marcu 2016-11-02 19:36:59 -07:00 committed by GitHub
parent 0e768cc6f4 647aa2c0f6
commit e588d78299
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server_test.go
View file

@ -450,7 +450,9 @@ func TestPostJSONUploadMaxExpiry(t *testing.T) {
mux := setup()
Config.maxExpiry = 300
testExpiries := []string{"86400", "-150"}
// include 0 to test edge case
// https://github.com/andreimarcu/linx-server/issues/111
testExpiries := []string{"86400", "-150", "0"}
for _, expiry := range testExpiries {
w := httptest.NewRecorder()

2
upload.go
View file

@ -349,7 +349,7 @@ func parseExpiry(expStr string) time.Duration {
if err != nil {
return time.Duration(Config.maxExpiry) * time.Second
} else {
if Config.maxExpiry > 0 && expiry > Config.maxExpiry {
if Config.maxExpiry > 0 && (expiry > Config.maxExpiry || expiry == 0) {
expiry = Config.maxExpiry
}
return time.Duration(expiry) * time.Second