mirror of
https://github.com/httprunner/httprunner.git
synced 2026-07-12 16:01:27 +08:00
Merge "v5" into "wings"
Conflicts: internal/version/VERSION
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v5.3.4
|
v5.0.0+2502192152
|
||||||
|
|||||||
@@ -39,14 +39,14 @@ type DriverRequests struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const (
|
const (
|
||||||
rawSessionID = "<NoSession>"
|
emptySessionID = "<SessionNotInit>"
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewDriverSession() *DriverSession {
|
func NewDriverSession() *DriverSession {
|
||||||
timeout := 30 * time.Second
|
timeout := 30 * time.Second
|
||||||
session := &DriverSession{
|
session := &DriverSession{
|
||||||
ctx: context.Background(),
|
ctx: context.Background(),
|
||||||
ID: rawSessionID,
|
ID: emptySessionID,
|
||||||
timeout: timeout,
|
timeout: timeout,
|
||||||
client: &http.Client{
|
client: &http.Client{
|
||||||
Timeout: timeout,
|
Timeout: timeout,
|
||||||
@@ -101,8 +101,8 @@ func (s *DriverSession) concatURL(urlStr string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// replace with session ID
|
// replace with session ID
|
||||||
if s.ID != rawSessionID {
|
if s.ID != emptySessionID {
|
||||||
urlStr = strings.Replace(urlStr, rawSessionID, s.ID, 1)
|
urlStr = strings.Replace(urlStr, emptySessionID, s.ID, 1)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 处理完整 URL
|
// 处理完整 URL
|
||||||
|
|||||||
Reference in New Issue
Block a user