Index: openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl	11 Mar 2021 10:18:06 -0000	1.1.2.2
+++ openacs-4/packages/xooauth/tcl/oauth-client-procs.tcl	12 Mar 2021 10:23:58 -0000	1.1.2.3
@@ -81,7 +81,9 @@
     if {[$r set status_code] eq 200} {
       [:context] load_form_parameter
       #TODO: Also used by server - make a method
-      foreach {key value} [ns_set array [ns_parsequery [$r set data]] {
+      #TODO - Replace with a regexp
+      foreach pair [split [$r set data] &] {
+        lassign [split $pair =] key value
         set creds($key) [:decode $value]
         :log "set creds($key) [:decode $value]"
       }
Index: openacs-4/packages/xooauth/tcl/oauth-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xooauth/tcl/oauth-procs.tcl,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/xooauth/tcl/oauth-procs.tcl	11 Mar 2021 10:20:16 -0000	1.1.2.3
+++ openacs-4/packages/xooauth/tcl/oauth-procs.tcl	12 Mar 2021 10:23:58 -0000	1.1.2.4
@@ -500,7 +500,8 @@
       set parameter_pair_list [list]
 
       # Step 1: Get query parameters
-      foreach {key value} [ns_set array [ns_parsequery $uri(query)]] {
+      foreach pair [split $uri(query) &] {
+        lassign [split $pair =] key value
         #:msg "parameter_list [list [ns_urldecode $key] [ns_urldecode $value]]"
         lappend parameter_pair_list [list [:decode $key] [:decode $value]]
       }
@@ -514,7 +515,8 @@
       # Step 3: Get Entity Body
       if {[string match "*x-www-form-urlencoded*" ${:content_type}]} {
         if {${:post_data} ne ""} {
-          foreach {key value} [ns_set array [ns_parsequery ${:post_data}]] {
+          foreach pair [split ${:post_data} &] {
+            lassign [split $pair =] key value
             #:msg "parameter_list [list [ns_urldecode $key] [ns_urldecode $value]]"
             lappend parameter_pair_list [list [:decode $key] [:decode $value]]
           }