Skip to content

Commit b6fe974

Browse files
Ramsay Jonesgitster
authored andcommitted
lib-git-svn.sh: Avoid setting web server variables unnecessarily
If the SVN_HTTPD_PORT variable is not set, then we will not even attempt to start a web server in the start_httpd function (despite it's name), so there is no need to determine values for the SVN_HTTPD_PATH and SVN_HTTPD_MODULE_PATH variables. Signed-off-by: Ramsay Jones <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 531dd7b commit b6fe974

File tree

1 file changed

+25
-22
lines changed

1 file changed

+25
-22
lines changed

t/lib-git-svn.sh

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -68,28 +68,31 @@ svn_cmd () {
6868
svn "$orig_svncmd" --config-dir "$svnconf" "$@"
6969
}
7070

71-
for d in \
72-
"$SVN_HTTPD_PATH" \
73-
/usr/sbin/apache2 \
74-
/usr/sbin/httpd \
75-
; do
76-
if test -f "$d"
77-
then
78-
SVN_HTTPD_PATH="$d"
79-
break
80-
fi
81-
done
82-
for d in \
83-
"$SVN_HTTPD_MODULE_PATH" \
84-
/usr/lib/apache2/modules \
85-
/usr/libexec/apache2 \
86-
; do
87-
if test -d "$d"
88-
then
89-
SVN_HTTPD_MODULE_PATH="$d"
90-
break
91-
fi
92-
done
71+
if test -n "$SVN_HTTPD_PORT"
72+
then
73+
for d in \
74+
"$SVN_HTTPD_PATH" \
75+
/usr/sbin/apache2 \
76+
/usr/sbin/httpd \
77+
; do
78+
if test -f "$d"
79+
then
80+
SVN_HTTPD_PATH="$d"
81+
break
82+
fi
83+
done
84+
for d in \
85+
"$SVN_HTTPD_MODULE_PATH" \
86+
/usr/lib/apache2/modules \
87+
/usr/libexec/apache2 \
88+
; do
89+
if test -d "$d"
90+
then
91+
SVN_HTTPD_MODULE_PATH="$d"
92+
break
93+
fi
94+
done
95+
fi
9396

9497
start_httpd () {
9598
repo_base_path="$1"

0 commit comments

Comments
 (0)