API: Reenable Recursor tests

And fix a memory/rapidjson issue.

If the data is correct is yet to be seen.

diff --git a/.travis.yml b/.travis.yml
index 7f95975b737b3b3d97db562febf9eecf48a0e822..08927f0459bc8fbe7d1ba24c523408c618bef232 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -293,7 +293,7 @@ script:
   ### api ###
   - cd regression-tests.api
   - ./runtests authoritative
-  #DNSName: - ./runtests recursor
+  - ./runtests recursor
   - cd ..
 
 

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 978e9da1b07dffdb2c0b2be88dc0b80bf288ff54..41f08568283cb591f724bd5ac3c32768af3a3945 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -149,8 +149,8 @@ static void fillZone(const DNSName& zonename, HttpResponse* resp)
   string url = "/api/v1/servers/localhost/zones/" + zoneId;
   Value jurl(url.c_str(), doc.GetAllocator()); // copy
   doc.AddMember("url", jurl, doc.GetAllocator());
-  Value jname(iter->first.toString().c_str(), doc.GetAllocator()); // copy
-  doc.AddMember("name", jname, doc.GetAllocator());
+  Value jzonename(iter->first.toString().c_str(), doc.GetAllocator()); // copy
+  doc.AddMember("name", jzonename, doc.GetAllocator());
   doc.AddMember("kind", zone.d_servers.empty() ? "Native" : "Forwarded", doc.GetAllocator());
   Value servers;
   servers.SetArray();
@@ -309,7 +309,8 @@ static void apiServerZones(HttpRequest* req, HttpResponse* resp)
     string url = "/api/v1/servers/localhost/zones/" + zoneId;
     Value jurl(url.c_str(), doc.GetAllocator()); // copy
     jdi.AddMember("url", jurl, doc.GetAllocator());
-    jdi.AddMember("name", val.first.toString().c_str(), doc.GetAllocator());
+    Value jzonename(val.first.toString().c_str(), doc.GetAllocator()); // copy
+    jdi.AddMember("name", jzonename, doc.GetAllocator());
     jdi.AddMember("kind", zone.d_servers.empty() ? "Native" : "Forwarded", doc.GetAllocator());
     Value servers;
     servers.SetArray();