From 4f4bcdd3c32389d2ecc2718f6940b18151cb5d73 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 9 Nov 2012 14:23:25 +0000
Subject: [PATCH] tests: make sure mod_proxy doesn't leave running processes
 (fixes #2435, thx kibi)

In case the proxy instance goes wrong, the clean-up doesn't kill the
real instance. So close both instances explicitly in the clean-up
phase.

Signed-off-by: Cyril Brulebois <kibi@debian.org>

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2857 152afb58-edef-0310-8abb-c4023f1b3aa9
---
 NEWS              | 1 +
 tests/mod-proxy.t | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index ff8bbb12..4e20cace 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ NEWS
   * fix :port handling in $HTTP["host"] checks (fixes #2135. thx liming)
   * network_server_init: fix double free and memleak on error (fixes #2440, thx kyprizel)
   * detect "x-gzip"/"x-bzip2" as separate encodings, more strict encoding matching (fixes #2443)
+  * tests: make sure mod_proxy doesn't leave running processes (fixes #2435, thx kibi)
 
 - 1.4.31 - 2012-05-31
   * [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI (thx carpii for reporting)
diff --git a/tests/mod-proxy.t b/tests/mod-proxy.t
index 0c7283ea..13690a4d 100755
--- a/tests/mod-proxy.t
+++ b/tests/mod-proxy.t
@@ -82,5 +82,7 @@ exit 0;
 cleanup:
 
 $tf_real->endspawnfcgi($php_child) if $php_child != -1;
+$tf_real->stop_proc;
+$tf_proxy->stop_proc;
 
 die();