Remove CURL and REMOTEBACKEND_HTTP

diff --git a/configure.ac b/configure.ac
index 22045699059376cfad21d3e9026abfde04b4752a..7c048dcfb20cc18f35a058aa9450db2d06d85da2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,6 @@ PDNS_WITH_SYSTEM_POLARSSL
 PDNS_ENABLE_BOTAN
 PDNS_ENABLE_PKCS11
 PDNS_WITH_CRYPTOPP
-PDNS_ENABLE_REMOTEBACKEND_HTTP
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
 AC_MSG_CHECKING([whether we should build static binaries])

diff --git a/m4/pdns_enable_remotebackend_http.m4 b/m4/pdns_enable_remotebackend_http.m4
deleted file mode 100644 (file)
index 90306bc..0000000
--- a/m4/pdns_enable_remotebackend_http.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-AC_DEFUN([PDNS_ENABLE_REMOTEBACKEND_HTTP],[
-  AC_MSG_CHECKING([whether to enable http connector in remotebackend])
-  AC_ARG_ENABLE([remotebackend_http],
-    AS_HELP_STRING([--enable-remotebackend-http],
-      [enable HTTP connector for remotebackend @<:@default=no@:>@]
-    ),
-    [enable_remotebackend_http=yes],
-    [enable_remotebackend_http=no]
-  )
-
-  AC_MSG_RESULT([$enable_remotebackend_http])
-
-  AM_CONDITIONAL([REMOTEBACKEND_HTTP],[test "x$enable_remotebackend_http" = "xyes"])
-  AC_SUBST(REMOTEBACKEND_HTTP)
-  AS_IF([test "x$enable_remotebackend_http" = "xyes"],
-    [PKG_CHECK_MODULES([LIBCURL], [libcurl],
-        [
-         AC_DEFINE([HAVE_LIBCURL], [1], [Define to 1 if you have libcurl])
-         AC_DEFINE([REMOTEBACKEND_HTTP], [1], [Define to 1 if you have http connector])
-         REMOTEBACKEND_HTTP=yes
-        ],
-        [AC_MSG_ERROR([Could not find libcurl])]
-     )]
-  )
-])
-

diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 95038731ee78b80dc63e6c322c0722f0213299e3..e7479f510fe5295cc9d1aa52d27cefbd25e22aaf 100644 (file)
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -18,7 +18,7 @@ libremotebackend_la_SOURCES=remotebackend.hh remotebackend.cc unixconnector.cc h
 libremotebackend_la_LDFLAGS=-module -avoid-version
 libremotebackend_la_LIBADD=$(LIBZMQ_LIBS) 
 
-TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_HTTP=$(REMOTEBACKEND_HTTP) REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh 
+TESTS_ENVIRONMENT = env BOOST_TEST_LOG_LEVEL=message REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ) ./testrunner.sh 
 TESTS=test_remotebackend_pipe test_remotebackend_unix test_remotebackend_http test_remotebackend_post test_remotebackend_json test_remotebackend_zeromq
 
 BUILT_SOURCES=../../pdns/dnslabeltext.cc
@@ -54,25 +54,25 @@ test_remotebackend_zeromq_SOURCES=test-remotebackend.cc test-remotebackend-zerom
 
 test_remotebackend_pipe_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_pipe_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_pipe_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS) 
+test_remotebackend_pipe_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
 test_remotebackend_unix_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_unix_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_unix_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS) 
+test_remotebackend_unix_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
 test_remotebackend_http_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_http_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_http_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS) 
+test_remotebackend_http_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
 test_remotebackend_post_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_post_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_post_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS) 
+test_remotebackend_post_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
 test_remotebackend_json_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_json_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_json_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS) 
+test_remotebackend_json_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS) 
 
 test_remotebackend_zeromq_CFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
 test_remotebackend_zeromq_CXXFLAGS=$(BOOST_CPPFLAGS) @THREADFLAGS@ -I../../pdns/ext/yahttp $(LIBZMQ_CFLAGS) -g -O0 -I../../pdns
-test_remotebackend_zeromq_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBCURL_LIBS) $(LIBZMQ_LIBS)
+test_remotebackend_zeromq_LDADD=libtestremotebackend.la @DYNLINKFLAGS@ @THREADFLAGS@ $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_SERIALIZATION_LIBS) $(BOOST_PROGRAM_OPTIONS_LIBS) @LIBDL@ $(POLARSSL_LIBS) $(LIBZMQ_LIBS)
 

diff --git a/modules/remotebackend/OBJECTLIBS b/modules/remotebackend/OBJECTLIBS
index 68e356cc0683474a9b223c555926841afa832619..e162d0d5f1f5625f3d07d1ab62ca15dddef07d48 100644 (file)
--- a/modules/remotebackend/OBJECTLIBS
+++ b/modules/remotebackend/OBJECTLIBS
@@ -1 +1 @@
-$(LIBCURL_LIBS) $(LIBZMQ_LIBS)
+$(LIBZMQ_LIBS)

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index 2055f30e95aac336e75a8b0ab8b8b935a561d1a9..14bde799acfecadfed247600694e3177fbd94de9 100644 (file)
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -137,11 +137,7 @@ int RemoteBackend::build() {
       if (type == "unix") {
         this->connector = new UnixsocketConnector(options);
       } else if (type == "http") {
-#ifdef REMOTEBACKEND_HTTP
         this->connector = new HTTPConnector(options);
-#else
-       throw PDNSException("Invalid connection string: http connector support not enabled. Recompile with --enable-remotebackend-http");
-#endif
       } else if (type == "zeromq") {
 #ifdef REMOTEBACKEND_ZEROMQ
         this->connector = new ZeroMQConnector(options);

diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc
index 590ef7ca1f3c45035862ceb1593f9c387736135d..ced7179d53e1bf7335f876f4203db7d3b3ca54a7 100644 (file)
--- a/modules/remotebackend/test-remotebackend-http.cc
+++ b/modules/remotebackend/test-remotebackend-http.cc
@@ -29,8 +29,6 @@ class RemoteLoader
 
 DNSBackend *be;
 
-#ifdef REMOTEBACKEND_HTTP
-
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
@@ -60,14 +58,3 @@ struct RemotebackendSetup {
 };
 
 BOOST_GLOBAL_FIXTURE( RemotebackendSetup );
-
-#else
-
-#include <iostream>
-
-int main(void) {
-  std::cout << "No HTTP support in remotebackend - skipping test" << std::endl;
-  return 0;
-}
-
-#endif

diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc
index fcbb9b30fcf7e61879dd492a9a9b35ebcfe456bf..4aa867089b998c68b9b452f0d337a572ffa2bc52 100644 (file)
--- a/modules/remotebackend/test-remotebackend-json.cc
+++ b/modules/remotebackend/test-remotebackend-json.cc
@@ -29,8 +29,6 @@ class RemoteLoader
 
 DNSBackend *be;
 
-#ifdef REMOTEBACKEND_HTTP
-
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
@@ -60,14 +58,3 @@ struct RemotebackendSetup {
 };
 
 BOOST_GLOBAL_FIXTURE( RemotebackendSetup );
-
-#else
-
-#include <iostream>
-
-int main(void) {
-  std::cout << "No HTTP support in remotebackend - skipping test" << std::endl;
-  return 0;
-}
-
-#endif

diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc
index e22e842b959e8a345e624cc0ae6aa8917c42ee49..2e69e2c45cec37d0e1c617f955b3c8f7f9cffcc0 100644 (file)
--- a/modules/remotebackend/test-remotebackend-post.cc
+++ b/modules/remotebackend/test-remotebackend-post.cc
@@ -29,8 +29,6 @@ class RemoteLoader
 
 DNSBackend *be;
 
-#ifdef REMOTEBACKEND_HTTP
-
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_MODULE unit
@@ -60,14 +58,3 @@ struct RemotebackendSetup {
 };
 
 BOOST_GLOBAL_FIXTURE( RemotebackendSetup );
-
-#else
-
-#include <iostream>
-
-int main(void) {
-  std::cout << "No HTTP support in remotebackend - skipping test" << std::endl;
-  return 0;
-}
-
-#endif

diff --git a/modules/remotebackend/testrunner.sh b/modules/remotebackend/testrunner.sh
index e607351dc75d6ca93c279894061bddc05af408e0..e1250b2be9ae3e03299ebc7406b859a52581926a 100755 (executable)
--- a/modules/remotebackend/testrunner.sh
+++ b/modules/remotebackend/testrunner.sh
@@ -23,17 +23,15 @@ zeromq_pid=""
 socat=$(which socat)
 
 function start_web() {
-  if [ x"$REMOTEBACKEND_HTTP" == "xyes" ]; then
-   ./unittest_$1.rb >> $mode.log 2>&1 & 
-   webrick_pid=$!
-   loopcount=0
-   while [ $loopcount -lt 20 ]; do
-     res=$(curl http://localhost:62434/ping 2>/dev/null)
-     if [ "x$res" == "xpong" ]; then break; fi
-     sleep 1
-     let loopcount=loopcount+1
-   done
-  fi
+ ./unittest_$1.rb >> $mode.log 2>&1 & 
+ webrick_pid=$!
+ loopcount=0
+ while [ $loopcount -lt 20 ]; do
+   res=$(curl http://localhost:62434/ping 2>/dev/null)
+   if [ "x$res" == "xpong" ]; then break; fi
+   sleep 1
+   let loopcount=loopcount+1
+  done
 }
 
 function stop_web() {

diff --git a/modules/remotebackend/unittest_http.rb b/modules/remotebackend/unittest_http.rb
index 8e83d79c80f03c76208d4e2508fd64ccee3ca88d..6ba013217ff837e027740274aed6f769477c3b0f 100755 (executable)
--- a/modules/remotebackend/unittest_http.rb
+++ b/modules/remotebackend/unittest_http.rb
@@ -167,6 +167,14 @@ class DNSBackendHandler < WEBrick::HTTPServlet::AbstractServlet
    def do_POST(req,res)
      do_GET(req,res)
    end 
+
+   def do_PATCH(req,res)
+     do_GET(req,res)
+   end
+  
+   def do_PUT(req,res)
+     do_GET(req,res)
+   end
 end
 
 server = WEBrick::HTTPServer.new(