Merge branch 'dev' into cluster
This commit is contained in:
commit
adf43eaf01
@ -2,4 +2,4 @@
|
||||
OS_NAME=alpine
|
||||
OS_VERSION=3.16
|
||||
GOLANG_IMAGE=golang:1.20-alpine3.16
|
||||
CORE_VERSION=16.12.0
|
||||
CORE_VERSION=16.13.0
|
||||
|
||||
@ -2,4 +2,4 @@
|
||||
OS_NAME=ubuntu
|
||||
OS_VERSION=20.04
|
||||
GOLANG_IMAGE=golang:1.20-alpine3.16
|
||||
CORE_VERSION=16.12.0
|
||||
CORE_VERSION=16.13.0
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Core
|
||||
|
||||
### Core v16.12.0 > v16.?.?
|
||||
### Core v16.12.0 > v16.13.0
|
||||
|
||||
- Add updated_at field in process infos
|
||||
- Add preserve process log history when updating a process
|
||||
|
||||
@ -29,7 +29,7 @@ func (v versionInfo) MinorString() string {
|
||||
// Version of the app
|
||||
var Version = versionInfo{
|
||||
Major: 16,
|
||||
Minor: 12,
|
||||
Minor: 13,
|
||||
Patch: 0,
|
||||
}
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"path"
|
||||
urlpath "path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
@ -415,7 +414,7 @@ func (g *sessionRewriter) rewriteHLS(sessionID string, requestURL *url.URL) {
|
||||
// and has to be stopped.
|
||||
file := u.Path
|
||||
if !strings.HasPrefix(file, "/") {
|
||||
dir := path.Dir(requestURL.Path)
|
||||
dir := urlpath.Dir(requestURL.Path)
|
||||
file = filepath.Join(dir, file)
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user