From d1866f6a309b5f687cb92f724f17e435e30f3b93 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 8 Jul 2013 14:30:05 +0200
Subject: remove merge artifacts

---
 test/interactive-helper/aptwebserver.cc | 20 ++------------------
 test/interactive-helper/makefile        |  2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)

(limited to 'test')

diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc
index dc17d4991..a8d191d0e 100644
--- a/test/interactive-helper/aptwebserver.cc
+++ b/test/interactive-helper/aptwebserver.cc
@@ -341,8 +341,6 @@ bool parseFirstLine(int const client, std::string const &request,	/*{{{*/
 int main(int const argc, const char * argv[])
 {
    CommandLine::Args Args[] = {
-      {0, "simulate-paywall", "aptwebserver::Simulate-Paywall",
-       CommandLine::Boolean},
       {0, "port", "aptwebserver::port", CommandLine::HasArg},
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
@@ -367,9 +365,7 @@ int main(int const argc, const char * argv[])
       return 1;
    }
 
-   // get the port
    int const port = _config->FindI("aptwebserver::port", 8080);
-   bool const simulate_broken_server = _config->FindB("aptwebserver::Simulate-Paywall", false);
 
    // ensure that we accept all connections: v4 or v6
    int const iponly = 0;
@@ -426,12 +422,8 @@ int main(int const argc, const char * argv[])
       }
    }
 
-   if (simulate_broken_server) {
-      std::clog << "Simulating a broken web server that return nonsense "
-                   "for all querries" << std::endl;
-   } else {
-      std::clog << "Serving ANY file on port: " << port << std::endl;
-   }
+   std::clog << "Serving ANY file on port: " << port << std::endl;
+
    listen(sock, 1);
    /*}}}*/
 
@@ -463,14 +455,6 @@ int main(int const argc, const char * argv[])
 	       continue;
 	    }
 
-	    if (simulate_broken_server == true) {
-	       std::string data("ni ni ni\n");
-	       addDataHeaders(headers, data);
-	       sendHead(client, 200, headers);
-	       sendData(client, data);
-               continue;
-	    }
-
 	    // string replacements in the requested filename
 	    ::Configuration::Item const *Replaces = _config->Tree("aptwebserver::redirect::replace");
 	    if (Replaces != NULL)
diff --git a/test/interactive-helper/makefile b/test/interactive-helper/makefile
index 74659cf12..f43df97e3 100644
--- a/test/interactive-helper/makefile
+++ b/test/interactive-helper/makefile
@@ -39,7 +39,7 @@ include $(PROGRAM_H)
 #SOURCE = rpmver.cc
 #include $(PROGRAM_H)
 
-# very simple webserver for APT testing
+# Program for testing udevcdrom
 PROGRAM=aptwebserver
 SLIBS = -lapt-pkg
 LIB_MAKES = apt-pkg/makefile
-- 
cgit v1.2.3