diff options
author | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-08 20:31:35 (GMT) |
---|---|---|
committer | dkf <donal.k.fellows@manchester.ac.uk> | 2013-01-08 20:31:35 (GMT) |
commit | 38dfb78b4e41733a7390a1c787ea7ab0fd95c8d1 (patch) | |
tree | 6b7ef1ef08b311df789c43b0c9b28948b86accdc /library/http | |
parent | a1db4012d910de13424097d808dfa19402ef4125 (diff) | |
parent | 24b681cb7a18f81e241184bbed203e9a3e53012b (diff) | |
download | tcl-38dfb78b4e41733a7390a1c787ea7ab0fd95c8d1.zip tcl-38dfb78b4e41733a7390a1c787ea7ab0fd95c8d1.tar.gz tcl-38dfb78b4e41733a7390a1c787ea7ab0fd95c8d1.tar.bz2 |
merge trunk
Diffstat (limited to 'library/http')
-rw-r--r-- | library/http/http.tcl | 4 | ||||
-rw-r--r-- | library/http/pkgIndex.tcl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/http/http.tcl b/library/http/http.tcl index b8ab0d0..4d8aa51 100644 --- a/library/http/http.tcl +++ b/library/http/http.tcl @@ -11,7 +11,7 @@ package require Tcl 8.6 # Keep this in sync with pkgIndex.tcl and with the install directories in # Makefiles -package provide http 2.8.5 +package provide http 2.8.6 namespace eval http { # Allow resourcing to not clobber existing data @@ -1487,7 +1487,7 @@ proc http::mapReply {string} { } set converted [string map $formMap $string] if {[string match "*\[\u0100-\uffff\]*" $converted]} { - regexp {[\u0100-\uffff]} $converted badChar + regexp "\[\u0100-\uffff\]" $converted badChar # Return this error message for maximum compatability... :^/ return -code error \ "can't read \"formMap($badChar)\": no such element in array" diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index 1211a34..ae36e64 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -1,4 +1,4 @@ if {![package vsatisfies [package provide Tcl] 8.6]} {return} -package ifneeded http 2.8.5 [list tclPkgSetup $dir http 2.8.5 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] +package ifneeded http 2.8.6 [list tclPkgSetup $dir http 2.8.6 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]] package ifndeeded tcl::idna 1.0 [list source [file join $dir idna.tcl]] |