Artifact
978b18e0ba56af2c1d91d8cd2b5811fcbef56a0d:
Attachment "httpsync.patch" to
ticket [3382532fff]
added by
ferrieux
2011-07-31 23:07:16.
0000: 49 6e 64 65 78 3a 20 6c 69 62 72 61 72 79 2f 68 Index: library/h
0010: 74 74 70 2f 68 74 74 70 2e 74 63 6c 0a 3d 3d 3d ttp/http.tcl.===
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0050: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0060: 0a 2d 2d 2d 20 6c 69 62 72 61 72 79 2f 68 74 74 .--- library/htt
0070: 70 2f 68 74 74 70 2e 74 63 6c 0a 2b 2b 2b 20 6c p/http.tcl.+++ l
0080: 69 62 72 61 72 79 2f 68 74 74 70 2f 68 74 74 70 ibrary/http/http
0090: 2e 74 63 6c 0a 40 40 20 2d 37 34 35 2c 31 38 20 .tcl.@@ -745,18
00a0: 2b 37 34 35 2c 33 30 20 40 40 0a 20 09 20 20 20 +745,30 @@. .
00b0: 20 66 6c 75 73 68 20 24 73 6f 63 6b 0a 20 09 20 flush $sock. .
00c0: 20 20 20 66 69 6c 65 65 76 65 6e 74 20 24 73 6f fileevent $so
00d0: 63 6b 20 72 65 61 64 61 62 6c 65 20 5b 6c 69 73 ck readable [lis
00e0: 74 20 68 74 74 70 3a 3a 45 76 65 6e 74 20 24 73 t http::Event $s
00f0: 6f 63 6b 20 24 74 6f 6b 65 6e 5d 0a 20 09 7d 0a ock $token]. .}.
0100: 20 0a 20 09 69 66 20 7b 21 5b 69 6e 66 6f 20 65 . .if {![info e
0110: 78 69 73 74 73 20 73 74 61 74 65 28 2d 63 6f 6d xists state(-com
0120: 6d 61 6e 64 29 5d 7d 20 7b 0a 2d 09 20 20 20 20 mand)]} {.-.
0130: 23 20 67 65 74 75 72 6c 20 64 6f 65 73 20 45 56 # geturl does EV
0140: 45 52 59 54 48 49 4e 47 20 61 73 79 6e 63 68 72 ERYTHING asynchr
0150: 6f 6e 6f 75 73 6c 79 2c 20 73 6f 20 69 66 20 74 onously, so if t
0160: 68 65 20 75 73 65 72 20 63 61 6c 6c 73 20 69 74 he user calls it
0170: 0a 2d 09 20 20 20 20 23 20 73 79 6e 63 68 72 6f .-. # synchro
0180: 6e 6f 75 73 6c 79 2c 20 77 65 20 6a 75 73 74 20 nously, we just
0190: 64 6f 20 61 20 77 61 69 74 20 68 65 72 65 2e 0a do a wait here..
01a0: 2b 09 20 20 20 20 69 66 20 7b 21 24 73 74 61 74 +. if {!$stat
01b0: 65 28 2d 74 69 6d 65 6f 75 74 29 20 26 26 20 20 e(-timeout) &&
01c0: 21 5b 73 74 72 69 6e 67 20 6c 65 6e 67 74 68 20 ![string length
01d0: 24 73 74 61 74 65 28 2d 71 75 65 72 79 70 72 6f $state(-querypro
01e0: 67 72 65 73 73 29 5d 20 26 26 20 21 24 69 73 51 gress)] && !$isQ
01f0: 75 65 72 79 43 68 61 6e 6e 65 6c 20 26 26 20 21 ueryChannel && !
0200: 5b 69 6e 66 6f 20 65 78 69 73 74 73 20 73 74 61 [info exists sta
0210: 74 65 28 2d 63 68 61 6e 6e 65 6c 29 5d 7d 20 7b te(-channel)]} {
0220: 0a 2b 09 09 23 20 73 70 65 63 69 61 6c 20 66 75 .+..# special fu
0230: 6c 6c 2d 73 79 6e 63 20 63 61 73 65 2c 20 61 76 ll-sync case, av
0240: 6f 69 64 20 64 6f 69 6e 67 20 61 20 77 61 69 74 oid doing a wait
0250: 0a 20 0a 2d 09 20 20 20 20 77 61 69 74 20 24 74 . .-. wait $t
0260: 6f 6b 65 6e 0a 2d 09 20 20 20 20 69 66 20 7b 24 oken.-. if {$
0270: 73 74 61 74 65 28 73 74 61 74 75 73 29 20 65 71 state(status) eq
0280: 20 22 65 72 72 6f 72 22 7d 20 7b 0a 2d 09 09 23 "error"} {.-..#
0290: 20 53 6f 6d 65 74 68 69 6e 67 20 77 65 6e 74 20 Something went
02a0: 77 72 6f 6e 67 2c 20 73 6f 20 74 68 72 6f 77 20 wrong, so throw
02b0: 74 68 65 20 65 78 63 65 70 74 69 6f 6e 2c 20 61 the exception, a
02c0: 6e 64 20 74 68 65 0a 2d 09 09 23 20 65 6e 63 6c nd the.-..# encl
02d0: 6f 73 69 6e 67 20 63 61 74 63 68 20 77 69 6c 6c osing catch will
02e0: 20 64 6f 20 63 6c 65 61 6e 75 70 2e 0a 2d 09 09 do cleanup..-..
02f0: 72 65 74 75 72 6e 20 2d 63 6f 64 65 20 65 72 72 return -code err
0300: 6f 72 20 5b 6c 69 6e 64 65 78 20 24 73 74 61 74 or [lindex $stat
0310: 65 28 65 72 72 6f 72 29 20 30 5d 0a 2b 09 09 66 e(error) 0].+..f
0320: 63 6f 6e 66 69 67 75 72 65 20 24 73 6f 63 6b 20 configure $sock
0330: 2d 62 6c 6f 63 6b 69 6e 67 20 6f 6e 0a 2b 09 09 -blocking on.+..
0340: 69 66 20 7b 24 69 73 51 75 65 72 79 20 7c 7c 20 if {$isQuery ||
0350: 24 69 73 51 75 65 72 79 43 68 61 6e 6e 65 6c 7d $isQueryChannel}
0360: 20 7b 0a 2b 09 09 20 20 20 20 75 70 6c 65 76 65 {.+.. upleve
0370: 6c 20 23 30 20 5b 6c 69 73 74 20 68 74 74 70 3a l #0 [list http:
0380: 3a 57 72 69 74 65 20 24 74 6f 6b 65 6e 5d 0a 2b :Write $token].+
0390: 09 09 7d 0a 2b 09 09 77 68 69 6c 65 20 7b 21 5b ..}.+..while {![
03a0: 72 65 67 65 78 70 20 7b 5e 28 3f 3a 6f 6b 7c 65 regexp {^(?:ok|e
03b0: 72 72 6f 72 29 24 7d 20 24 73 74 61 74 65 28 73 rror)$} $state(s
03c0: 74 61 74 75 73 29 5d 7d 20 7b 0a 2b 09 09 20 20 tatus)]} {.+..
03d0: 20 20 75 70 6c 65 76 65 6c 20 23 30 20 5b 6c 69 uplevel #0 [li
03e0: 73 74 20 68 74 74 70 3a 3a 45 76 65 6e 74 20 24 st http::Event $
03f0: 73 6f 63 6b 20 24 74 6f 6b 65 6e 5d 0a 2b 09 09 sock $token].+..
0400: 7d 0a 2b 09 20 20 20 20 7d 20 65 6c 73 65 20 7b }.+. } else {
0410: 0a 2b 09 09 23 20 6f 74 68 65 72 77 69 73 65 2c .+..# otherwise,
0420: 20 67 65 74 75 72 6c 20 64 6f 65 73 20 45 56 45 geturl does EVE
0430: 52 59 54 48 49 4e 47 20 61 73 79 6e 63 68 72 6f RYTHING asynchro
0440: 6e 6f 75 73 6c 79 3b 20 73 6f 20 69 66 20 74 68 nously; so if th
0450: 65 20 75 73 65 72 20 63 61 6c 6c 73 20 69 74 0a e user calls it.
0460: 2b 09 09 23 20 73 79 6e 63 68 72 6f 6e 6f 75 73 +..# synchronous
0470: 6c 79 2c 20 77 65 20 6a 75 73 74 20 64 6f 20 61 ly, we just do a
0480: 20 77 61 69 74 20 68 65 72 65 2e 0a 2b 09 09 0a wait here..+...
0490: 2b 09 09 77 61 69 74 20 24 74 6f 6b 65 6e 0a 2b +..wait $token.+
04a0: 09 09 69 66 20 7b 24 73 74 61 74 65 28 73 74 61 ..if {$state(sta
04b0: 74 75 73 29 20 65 71 20 22 65 72 72 6f 72 22 7d tus) eq "error"}
04c0: 20 7b 0a 2b 09 09 20 20 20 20 23 20 53 6f 6d 65 {.+.. # Some
04d0: 74 68 69 6e 67 20 77 65 6e 74 20 77 72 6f 6e 67 thing went wrong
04e0: 2c 20 73 6f 20 74 68 72 6f 77 20 74 68 65 20 65 , so throw the e
04f0: 78 63 65 70 74 69 6f 6e 2c 20 61 6e 64 20 74 68 xception, and th
0500: 65 0a 2b 09 09 20 20 20 20 23 20 65 6e 63 6c 6f e.+.. # enclo
0510: 73 69 6e 67 20 63 61 74 63 68 20 77 69 6c 6c 20 sing catch will
0520: 64 6f 20 63 6c 65 61 6e 75 70 2e 0a 2b 09 09 20 do cleanup..+..
0530: 20 20 20 72 65 74 75 72 6e 20 2d 63 6f 64 65 20 return -code
0540: 65 72 72 6f 72 20 5b 6c 69 6e 64 65 78 20 24 73 error [lindex $s
0550: 74 61 74 65 28 65 72 72 6f 72 29 20 30 5d 0a 2b tate(error) 0].+
0560: 09 09 7d 0a 20 09 20 20 20 20 7d 0a 20 09 7d 0a ..}. . }. .}.
0570: 20 20 20 20 20 7d 20 65 72 72 5d 7d 20 7b 0a 20 } err]} {.
0580: 09 23 20 54 68 65 20 73 6f 63 6b 65 74 20 70 72 .# The socket pr
0590: 6f 62 61 62 6c 79 20 77 61 73 20 6e 65 76 65 72 obably was never
05a0: 20 63 6f 6e 6e 65 63 74 65 64 2c 20 6f 72 20 74 connected, or t
05b0: 68 65 20 63 6f 6e 6e 65 63 74 69 6f 6e 20 64 72 he connection dr
05c0: 6f 70 70 65 64 0a 20 09 23 20 6c 61 74 65 72 2e opped. .# later.
05d0: 0a 0a ..