[backend] BSRPC: fix uri encoding if there is no host part

This happens if called from BSHandoff (i.e. if there already is a socket).
openSUSE · Jul 10, 2014 · 398174c · 398174c
1 parent eef6c42
commit 398174c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/backend/BSRPC.pm b/src/backend/BSRPC.pm
@@ -61,9 +61,14 @@ sub urlencode {
 sub createuri {
   my ($param, @args) = @_;
   my $uri = $param->{'uri'};
-  if (!$param->{'verbatim_uri'} && $uri =~ /^(https?:\/\/[^\/]*\/)(.*)$/s) {
-    $uri = $1; 
-    $uri .= BSRPC::urlencode($2);
+  if (!$param->{'verbatim_uri'}) {
+    # encode uri, but do not encode the host part
+    if ($uri =~ /^(https?:\/\/[^\/]*\/)(.*)$/s) {
+      $uri = $1; 
+      $uri .= urlencode($2);
+    } else {
+      $uri = urlencode($uri);
+    }
   }
   if (@args) {
     for (@args) {