From 2100623b8bfed6fff0b272564bd811503ed1a8fd Mon Sep 17 00:00:00 2001
From: Kevin O'Rourke <kevinor@opera.com>
Date: Wed, 20 Aug 2014 12:49:48 +0200
Subject: [PATCH] TURBO2-711: Fix URI path combining for empty base URI path.

---
 lib/modules/Standards.pmod/URI.pike | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/modules/Standards.pmod/URI.pike b/lib/modules/Standards.pmod/URI.pike
index b67e714668..903b2f410c 100644
--- a/lib/modules/Standards.pmod/URI.pike
+++ b/lib/modules/Standards.pmod/URI.pike
@@ -123,10 +123,7 @@ string combine_uri_path(string base, string rel)
   //    copied to the buffer.  In other words, any characters after the
   //    last (right-most) slash character, if any, are excluded.
   array segments=base/"/";
-  if(has_value(base, "/"))
-    buf=segments[..<1]*"/"+"/";
-  else
-    buf=base;
+  buf=segments[..<1]*"/"+"/";
 
   // b) The reference's path component is appended to the buffer string.
   buf+=rel;
-- 
GitLab