summaryrefslogtreecommitdiff
path: root/src/gmutil.c
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-11-18 12:28:19 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-11-18 12:28:19 +0200
commitb55b694fdc5c079de527282ce96a27d71291653b (patch)
tree5ed72e9e840c024dfd3c6eb787ff33b2690f859f /src/gmutil.c
parentfd75a01ee58cbf93b00b374adb4dc930fb1f39be (diff)
Handling an URL that contains nothing by a query
IssueID #40
Diffstat (limited to 'src/gmutil.c')
-rw-r--r--src/gmutil.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gmutil.c b/src/gmutil.c
index 79268dd4..39a1aef3 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -161,7 +161,7 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
161 if (isDef_(rel.scheme) || isDef_(rel.host) || isAbsolutePath_(rel.path)) { 161 if (isDef_(rel.scheme) || isDef_(rel.host) || isAbsolutePath_(rel.path)) {
162 appendRange_String(absolute, isDef_(rel.path) ? rel.path : range_CStr("/")); /* absolute path */ 162 appendRange_String(absolute, isDef_(rel.path) ? rel.path : range_CStr("/")); /* absolute path */
163 } 163 }
164 else { 164 else if (isDef_(rel.path)) {
165 if (!endsWith_Rangecc(orig.path, "/")) { 165 if (!endsWith_Rangecc(orig.path, "/")) {
166 /* Referencing a file. */ 166 /* Referencing a file. */
167 appendRange_String(absolute, dirPath_(orig.path)); 167 appendRange_String(absolute, dirPath_(orig.path));
@@ -175,6 +175,10 @@ const iString *absoluteUrl_String(const iString *d, const iString *urlMaybeRelat
175 } 175 }
176 appendRange_String(absolute, rel.path); 176 appendRange_String(absolute, rel.path);
177 } 177 }
178 else if (isDef_(rel.query)) {
179 /* Just a new query. */
180 appendRange_String(absolute, orig.path);
181 }
178 appendRange_String(absolute, rel.query); 182 appendRange_String(absolute, rel.query);
179 cleanUrlPath_String(absolute); 183 cleanUrlPath_String(absolute);
180 return absolute; 184 return absolute;