Changeset 13109 in project


Ignore:
Timestamp:
01/26/09 22:20:32 (11 years ago)
Author:
sjamaan
Message:

Merge latest changes from release 4 uri-generic

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

    r12924 r13109  
    108108    ("http://a/b/c/d/" "../e/" "http://a/b/c/e/")
    109109    ("http://a/b//c///d///" "..//.." "http://a/b/")
     110    ("http://a" "b" "http://a/b") ; RFC3986, section 5.2.3, first bullet point
    110111    ))
    111112
  • release/3/uri-generic/trunk/uri-generic.scm

    r13106 r13109  
    833833                                      x))
    834834
    835              (((lambda (p) (and (not (null? p)) p))  (uri-path ref)) =>
     835             ((let ((p (uri-path ref))) (and (not (null? p)) p)) =>
    836836              (lambda (ref-path)
    837837                (if (and (pair? ref-path) (eq? '/ (car ref-path)))
     
    873873        (pb (uri-path b))
    874874        (pr (uri-path r)))
    875     (let ((mp  (if (and ba (null? pb)) pr (merge0 pb pr))))
     875    (let ((mp (if (and ba (null? pb))
     876                  (merge0 '(/ "") pr) ; RFC3986, section 5.2.3, first bullet
     877                  (merge0 pb pr))))
    876878      mp)))
    877879
Note: See TracChangeset for help on using the changeset viewer.