diff options
Diffstat (limited to 'networking/httpd.c')
-rw-r--r-- | networking/httpd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 079145757..9369de824 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -2636,17 +2636,19 @@ int httpd_main(int argc UNUSED_PARAM, char **argv) | |||
2636 | #endif | 2636 | #endif |
2637 | 2637 | ||
2638 | home_httpd = xrealloc_getcwd_or_warn(NULL); | 2638 | home_httpd = xrealloc_getcwd_or_warn(NULL); |
2639 | /* -v counts, -i implies -f */ | ||
2640 | opt_complementary = "vv:if"; | ||
2641 | /* We do not "absolutize" path given by -h (home) opt. | 2639 | /* We do not "absolutize" path given by -h (home) opt. |
2642 | * If user gives relative path in -h, | 2640 | * If user gives relative path in -h, |
2643 | * $SCRIPT_FILENAME will not be set. */ | 2641 | * $SCRIPT_FILENAME will not be set. */ |
2644 | opt = getopt32(argv, "c:d:h:" | 2642 | opt = getopt32(argv, "^" |
2643 | "c:d:h:" | ||
2645 | IF_FEATURE_HTTPD_ENCODE_URL_STR("e:") | 2644 | IF_FEATURE_HTTPD_ENCODE_URL_STR("e:") |
2646 | IF_FEATURE_HTTPD_BASIC_AUTH("r:") | 2645 | IF_FEATURE_HTTPD_BASIC_AUTH("r:") |
2647 | IF_FEATURE_HTTPD_AUTH_MD5("m:") | 2646 | IF_FEATURE_HTTPD_AUTH_MD5("m:") |
2648 | IF_FEATURE_HTTPD_SETUID("u:") | 2647 | IF_FEATURE_HTTPD_SETUID("u:") |
2649 | "p:ifv", | 2648 | "p:ifv" |
2649 | "\0" | ||
2650 | /* -v counts, -i implies -f */ | ||
2651 | "vv:if", | ||
2650 | &opt_c_configFile, &url_for_decode, &home_httpd | 2652 | &opt_c_configFile, &url_for_decode, &home_httpd |
2651 | IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) | 2653 | IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) |
2652 | IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) | 2654 | IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) |