Merge remote-tracking branch 'monitoring-plugins/pr/1476'

* monitoring-plugins/pr/1476:
  test: Add proxy tests via proxy
  Allow user to specify HTTP method after proxy CONNECT

1 files changed, 3 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index 617c415..123e178 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,7 @@ install:
   - sudo apt-get install -qq --no-install-recommends autoconf automake
   - sudo apt-get install -qq --no-install-recommends faketime
   - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl
+  - sudo apt-get install -qq --no-install-recommends squid3
   # Trusty related dependencies (not yet provided)
   - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server
   # enable ssl apache
@@ -62,6 +63,8 @@ install:
   - sudo a2ensite default-ssl
   - sudo make-ssl-cert generate-default-snakeoil --force-overwrite
   - sudo service apache2 reload
+  - sudo cp tools/squid.conf /etc/squid3/squid.conf
+  - sudo service squid3 reload
 
 before_script:
   # ensure we have a test database in place for tests
@@ -93,4 +96,3 @@ notifications:
     skip_join: true
   email:
     # - team@monitoring-plugins.org
-