From: Michal Vaner <vorner@ucw.cz>
Date: Tue, 22 Jul 2008 12:45:46 +0000 (+0200)
Subject: Libucw: Update path parameter handling of URL to current RFC (2396).
X-Git-Tag: holmes-import~367
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=8e051b81b17a917637a16eb666443c95b053278d;p=libucw.git

Libucw: Update path parameter handling of URL to current RFC (2396).

Previous RFC had path parameters as separate component. With current RFC,
each path element can contain own path parameters.

When merging absolute/relative url, path parameters are taken as parts of
the elements, making special handling unnecessary.
---

diff --git a/ucw/url.c b/ucw/url.c
index f9ae9a2c..39f13a5f 100644
--- a/ucw/url.c
+++ b/ucw/url.c
@@ -7,10 +7,6 @@
  *	This software may be freely distributed and used according to the terms
  *	of the GNU Lesser General Public License.
  *
- *	The URL syntax corresponds to RFC 2396 with several exceptions:
- *
- *	   o  Interpretation of path parameters follows RFC 1808.
- *
  *	XXX: The buffer handling in this module is really horrible, but it works.
  */
 
@@ -323,15 +319,9 @@ relpath_merge(struct url *u, struct url *b)
 	;
       goto copy;
     }
-  if (a[0] == ';')			/* Change parameters */
-    {
-      for(p=o; *p && *p != ';' && *p != '?' && *p != '#'; p++)
-	;
-      goto copy;
-    }
 
   p = NULL;				/* Copy original path and find the last slash */
-  while (*o && *o != ';' && *o != '?' && *o != '#')
+  while (*o && *o != '?' && *o != '#')
     {
       if (d >= e)
 	return URL_ERR_TOO_LONG;