diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2002-05-31 19:22:58 +0200 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2002-05-31 19:22:58 +0200 |
| commit | dce5669ea592bfcde4608d46aaf6814e85a1c360 (patch) | |
| tree | 07882db4762c72b9858489cc26892d4e1cdf19e9 /support/ab.c | |
| parent | Implemented ap_os_create_privileged_process() for NetWare which simply maps to (diff) | |
| download | apache2-dce5669ea592bfcde4608d46aaf6814e85a1c360.tar.xz apache2-dce5669ea592bfcde4608d46aaf6814e85a1c360.zip | |
Well, know that I'm aware that the ssl stuff was entirely premature, it's
still worth committing the correct code to handle the port number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95447 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/ab.c')
| -rw-r--r-- | support/ab.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/support/ab.c b/support/ab.c index 8343e2290e..f2adbdb967 100644 --- a/support/ab.c +++ b/support/ab.c @@ -1398,14 +1398,14 @@ static void test(void) static void copyright(void) { if (!use_html) { - printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.102 $> apache-2.0"); + printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.103 $> apache-2.0"); printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n"); printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n"); printf("\n"); } else { printf("<p>\n"); - printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.102 $"); + printf(" This is ApacheBench, Version %s <i><%s></i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.103 $"); printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n"); printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n"); printf("</p>\n<p>\n"); @@ -1467,14 +1467,17 @@ static int parse_url(char *url) /* Save a copy for the proxy */ fullurl = apr_pstrdup(cntxt, url); - if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0) + if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0) { url += 7; +#if USE_SSL + ssl = 0; +#endif + } else #if USE_SSL if (strlen(url) > 8 && strncmp(url, "https://", 8) == 0) { url += 8; ssl = 1; - port = 443; } #else if (strlen(url) > 8 && strncmp(url, "https://", 8) == 0) { @@ -1502,8 +1505,14 @@ static int parse_url(char *url) } if (port == 0) { /* no port specified */ - port = 80; - }; +#if USE_SSL + if (ssl == 1) + port = 443; + else +#endif + port = 80; + } + if (( #if USE_SSL (ssl == 1) && (port != 443)) || (( ssl == 0 ) && |