summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-03 12:10:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-03 12:10:01 -0400
commit3a456e16a86b7e8415180eb3cf263a088b753022 (patch)
treedb4f7c59b325443636c51554953814789f796e09 /Utility
parent14fa5be33c1641e3212c45c7810e460b667f59b6 (diff)
switch to new URI version by default, -DWITH_OLD_URI for old
Diffstat (limited to 'Utility')
-rw-r--r--Utility/Url.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 2f5cb27c2..4e152159a 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -119,10 +119,10 @@ request url headers requesttype = go 5 url
Nothing -> return rsp
Just newURI -> go n newURI_abs
where
-#ifdef URI_24
- newURI_abs = newURI `relativeTo` u
-#else
+#ifdef WITH_OLD_URI
newURI_abs = fromMaybe newURI (newURI `relativeTo` u)
+#else
+ newURI_abs = newURI `relativeTo` u
#endif
addheaders req = setHeaders req (rqHeaders req ++ userheaders)
userheaders = rights $ map parseHeader headers