From: Dirk-Willem van Gulik <dirkx@apache.org>
Date: Thu, 11 Jul 2002 13:44:12 +0000 (+0000)
Subject: We where mixing #if USE_SSL en #ifdef USE_SSL. Since there where
X-Git-Tag: 2.0.40~272
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45aec24eded370b8568e0109a0dce0a54aba9c3f;p=apache

We where mixing #if USE_SSL en #ifdef USE_SSL. Since there where
many more #ifdef's than #if's - Converted the minority to the majority.

Note however that the APR_* defines are usually set to '=1'. So this is
not quite consistent. (I.e. CFLAGS=-DUSE_SSL or CFLAGS=-DUSE_SSL=1).

Dw.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96011 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/support/ab.c b/support/ab.c
index b70c6efa7b..6734bfe728 100644
--- a/support/ab.c
+++ b/support/ab.c
@@ -1726,14 +1726,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.109 $> apache-2.0");
+	printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.110 $> 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>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.109 $");
+	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.110 $");
 	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");
@@ -1797,7 +1797,7 @@ static int parse_url(char *url)
 
     if (strlen(url) > 7 && strncmp(url, "http://", 7) == 0) {
 	url += 7;
-#if USE_SSL
+#ifdef USE_SSL
 	ssl = 0;
 #endif
     }
@@ -1833,7 +1833,7 @@ static int parse_url(char *url)
     }
 
     if (port == 0) {		/* no port specified */
-#if USE_SSL
+#ifdef USE_SSL
         if (ssl == 1)
             port = 443;
         else
@@ -1842,7 +1842,7 @@ static int parse_url(char *url)
     }
 
     if ((
-#if USE_SSL
+#ifdef USE_SSL
          (ssl == 1) && (port != 443)) || (( ssl == 0 ) && 
 #endif
          (port != 80)))