[PATCH v6 17/40] lib-httpd: pass config file to start_httpd()
flat view
STALE3292d
From: Christian Couder <hidden>
Date: 2017-09-16 08:10:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v6 of 3 in this series.
Revisions (3)
- v4 [diff vs current]
- v5 [diff vs current]
- v6 current
This makes it possible to start an apache web server with different config files. This will be used in a later patch to pass a config file that makes apache store external objects. Signed-off-by: Christian Couder <redacted> --- t/lib-httpd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 435a37465a..2e659a8ee2 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh@@ -171,12 +171,14 @@ prepare_httpd() { } start_httpd() { + APACHE_CONF_FILE=${1-apache.conf} + prepare_httpd >&3 2>&4 trap 'code=$?; stop_httpd; (exit $code); die' EXIT "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ - -f "$TEST_PATH/apache.conf" $HTTPD_PARA \ + -f "$TEST_PATH/$APACHE_CONF_FILE" $HTTPD_PARA \ -c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \ >&3 2>&4 if test $? -ne 0
@@ -191,7 +193,7 @@ stop_httpd() { trap 'die' EXIT "$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \ - -f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop + -f "$TEST_PATH/$APACHE_CONF_FILE" $HTTPD_PARA -k stop } test_http_push_nonff () {
--
2.14.1.576.g3f707d88cd