Merge lp:~zorba-coders/zorba/bug-1015468 into lp:zorba

[Luis Rodriguez Gonzalez]

Fix bug 1015468: wrong relative URI resolution with fragment-only relative URIs.

[Luis Rodriguez Gonzalez (kuraru)]

I followed Chris' suggestion and now we use the full path to build the reference in the case when we don't have a path in the relative URI.

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1015468-2013-05-03T08-19-58.515Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1015468-2013-05-03T08-19-58.515Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

[Luis Rodriguez Gonzalez (kuraru)]

review: Approve

[Chris Hillery (ceejatec)]

ChangeLog entry will be added on bump-2.9 branch.

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/unit_tests/test_uri.cpp
text conflict in src/zorbatypes/URI.cpp

[lp:~zorba-coders/zorba/bug-1015468]

11422. By Luis Rodriguez Gonzalez on 2013-05-07

- Remerged with trunk

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1015468-2013-05-07T22-42-52.906Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1015468-2013-05-07T22-42-52.906Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/unit_tests/test_uri.cpp'
--- src/unit_tests/test_uri.cpp	2013-05-01 18:37:44 +0000
+++ src/unit_tests/test_uri.cpp	2013-05-07 21:47:27 +0000
@@ -292,7 +292,7 @@
   //  "",
   //  "/b/c/g",
   //  "",
-  //  "".
+  //  "",
   //  ""
   //}
     ,

=== modified file 'src/zorbatypes/URI.cpp'
--- src/zorbatypes/URI.cpp	2013-05-03 00:28:19 +0000
+++ src/zorbatypes/URI.cpp	2013-05-07 21:47:27 +0000
@@ -1311,20 +1311,14 @@
 
     if (base_uri->is_set(Path)) 
     {
-      // I think this is a bug in xerces because it doesn't remove the last segment
       zstring path;
       base_uri->get_path(path);
-
-      zstring::size_type last_slash = path.rfind("/");
-      if ( last_slash != zstring::npos )
-        thePath = path.substr(0, last_slash+1);
-      else 
-        thePath = path;
-
+      thePath = path;
       set_state(Path);
     }
 
-    if ( base_uri->is_set(QueryString) && !is_set(QueryString) )
+    if ( !is_set(QueryString) && base_uri->is_set(QueryString) &&
+         !base_uri->get_encoded_query().empty() )
     {
         base_uri->get_query(theQueryString);