Skip to content

Commit 822d301

Browse files
committed
Bugfix to socketPhQueue. Add some Log commands for debugging.
1 parent e977d6e commit 822d301

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

library/http/http.tcl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,9 +1665,12 @@ proc http::PreparePersistentConnection {token} {
16651665
set socketWrState($state(socketinfo)) $token
16661666
}
16671667

1668+
# Value of socketPhQueue() may have already been set by ReplayCore.
1669+
if {![info exists socketPhQueue($state(sock))]} {
1670+
set socketPhQueue($state(sock)) {}
1671+
}
16681672
set socketRdQueue($state(socketinfo)) {}
16691673
set socketWrQueue($state(socketinfo)) {}
1670-
set socketPhQueue($state(sock)) {}
16711674
set socketClosing($state(socketinfo)) 0
16721675
set socketPlayCmd($state(socketinfo)) {ReplayIfClose Wready {} {}}
16731676
set socketCoEvent($state(socketinfo)) {}
@@ -1839,7 +1842,7 @@ proc http::ConfigureNewSocket {token sockOld DoLater} {
18391842
set reusing $state(reusing)
18401843
set sock $state(sock)
18411844
set proxyUsed $state(proxyUsed)
1842-
##Log " ConfigureNewSocket" $token $sockOld ... -- $sock
1845+
##Log " ConfigureNewSocket" $token $sockOld ... -- $reusing $sock $proxyUsed
18431846

18441847
if {(!$reusing) && ($sock ne $sockOld)} {
18451848
# Replace the placeholder value sockOld with sock.
@@ -3071,6 +3074,7 @@ proc http::ReplayCore {newQueue} {
30713074

30723075
if {![ReInit $token]} {
30733076
Log FAILED in http::ReplayCore - NO tmp vars
3077+
Log ReplayCore reject $token
30743078
Finish $token {cannot send this request again}
30753079
return
30763080
}
@@ -3085,6 +3089,7 @@ proc http::ReplayCore {newQueue} {
30853089
set state(reusing) 0
30863090
set state(ReusingPlaceholder) 0
30873091
set state(alreadyQueued) 0
3092+
Log ReplayCore replay $token
30883093

30893094
# Give the socket a placeholder name before it is created.
30903095
set sock HTTP_PLACEHOLDER_[incr TmpSockCounter]
@@ -3097,7 +3102,9 @@ proc http::ReplayCore {newQueue} {
30973102
set ${tok}(reusing) 1
30983103
set ${tok}(sock) $sock
30993104
lappend socketPhQueue($sock) $tok
3105+
Log ReplayCore replay $tok
31003106
} else {
3107+
Log ReplayCore reject $tok
31013108
set ${tok}(reusing) 1
31023109
set ${tok}(sock) NONE
31033110
Finish $tok {cannot send this request again}

0 commit comments

Comments
 (0)