Changeset 12361 in project


Ignore:
Timestamp:
11/05/08 21:13:17 (12 years ago)
Author:
sjamaan
Message:

Backport patches to uri-generic release 3

Location:
release/3/uri-generic/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • release/3/uri-generic/trunk

  • release/3/uri-generic/trunk/tests/run.scm

    r12139 r12361  
    9595    (,base "g#s/./x" "http://a/b/c/g#s/./x")
    9696    (,base "g#s/../x" "http://a/b/c/g#s/../x")
     97   
     98    ("?a=b&c=d" "" "?a=b&c=d")
     99    (,base "" "http://a/b/c/d;p?q")
     100    ("" ,base "http://a/b/c/d;p?q")
    97101    ))
    98102
  • release/3/uri-generic/trunk/uri-generic.scm

    r12139 r12361  
    839839(define (merge0 pb pr)
    840840  (let* ((rpb  (reverse pb))
    841          (pb1  (reverse (if (not (string=? (car rpb) "/")) (cdr rpb) rpb)))
     841         (pb1  (reverse (if (and (pair? rpb) (not (string=? (car rpb) "/"))) (cdr rpb) rpb)))
    842842         (pr1  (or (and (pair? pr) (not (string=? ".." (car pr))) (not (string=? "." (car pr)))
    843843                        (not (string-prefix? "/" (car pr)))
Note: See TracChangeset for help on using the changeset viewer.