Drop experimental-json-interface from tests and doc

diff --git a/pdns/docs/web-api.md b/pdns/docs/web-api.md
index 87bc3b12b955fbf439e8183bbf0a87d474a15c8c..302c403502bd4c583eaf9ce95348c7957908a39c 100644 (file)
--- a/pdns/docs/web-api.md
+++ b/pdns/docs/web-api.md
@@ -49,7 +49,7 @@ For now, only enabled if the 'experimental-json-interface' parameter is configur
 API calls for the PowerDNS Recursor
 -----------------------------------
 
-For now, only enabled if the 'experimental-json-interface' parameter is configured, as this API is not yet fully stable.
+For now, only enabled if the 'experimental-webserver' parameter is configured, as this API is not yet fully stable.
 
  * flush-cache  
    Flush from the cache the domain specified in the parameter 'domain'

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 0531ccdabc0a389a7f43da39ee14e76c020e3a05..483a519b7c45753a751eb3b9b11322c0b6fb417b 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -90,7 +90,7 @@ else:
     with open(conf_dir+'/example.com..conf', 'w') as conf_file:
         conf_file.write(REC_EXAMPLE_COM_CONF_TPL)
 
-    pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-port=5555 --experimental-json-interface=yes --experimental-webserver=yes --experimental-webserver-port="+WEBPORT+" --experimental-webserver-address=127.0.0.1 --experimental-webserver-password="+WEBPASSWORD).split()
+    pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --config-dir=. --allow-from-file=acl.list --local-port=5555 --experimental-webserver=yes --experimental-webserver-port="+WEBPORT+" --experimental-webserver-address=127.0.0.1 --experimental-webserver-password="+WEBPASSWORD).split()
 
 
 # Now run pdns and the tests.