X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Furl.c;h=7145af5f764e80b9b9ed60cd223743a76093b008;hb=ba7d341ccf72d0e29554802fc399a24ea3aaaa3a;hp=f9ae9a2c22413fd8bdfafc52752671141a1c0455;hpb=3bc1920fa930698851eb4c6efca45ec0f0109d8c;p=libucw.git

diff --git a/ucw/url.c b/ucw/url.c
index f9ae9a2c..7145af5f 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;
@@ -615,7 +605,7 @@ int main(int argc, char **argv)
   char buf1[MAX_URL_SIZE], buf2[MAX_URL_SIZE], buf3[MAX_URL_SIZE], buf4[MAX_URL_SIZE];
   int err;
   struct url url, url0;
-  char *base = "http://mj@www.hell.org/123/sub_dir/index.html;param?query&zzz/subquery#fragment";
+  char *base = "http://mj@www.hell.org/123/sub_dir;param/index.html;param?query&zzz/sub;query+#fragment?";
 
   if (argc != 2 && argc != 3)
     return 1;