From: Joe Orton <jorton@apache.org>
Date: Wed, 16 Mar 2011 16:51:46 +0000 (+0000)
Subject: * modules/ssl/ssl_private.h: Drop some redundant/unused macros; pick
X-Git-Tag: 2.3.12~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32c4496dd327fd53af99ce748918fabc1a863dd7;p=thirdparty%2Fapache%2Fhttpd.git

* modules/ssl/ssl_private.h: Drop some redundant/unused macros; pick
  up stdlib.h.

* modules/ssl/ssl_engine_pphrase.c (ssl_pphrase_Handle),
  modules/ssl/ssl_engine_vars.c: Stop pretending mod_ssl has a version
  independent of the rest of the server.


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

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 61ab0a6fd7a..deb8f92d74d 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -747,8 +747,8 @@ int ssl_pphrase_Handle_CB(char *buf, int bufsize, int verify, void *srv)
          * something...
          */
         if (*pnPassPhraseDialog == 1) {
-            apr_file_printf(writetty, "%s mod_ssl/%s (Pass Phrase Dialog)\n",
-                            AP_SERVER_BASEVERSION, MOD_SSL_VERSION);
+            apr_file_printf(writetty, "%s mod_ssl (Pass Phrase Dialog)\n",
+                            AP_SERVER_BASEVERSION);
             apr_file_printf(writetty, "Some of your private key files are encrypted for security reasons.\n");
             apr_file_printf(writetty, "In order to read them you have to provide the pass phrases.\n");
         }
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index a8c0aef41f0..99d38325604 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -59,7 +59,7 @@ static int ssl_is_https(conn_rec *c)
     return sslconn && sslconn->ssl;
 }
 
-static const char var_interface[] = "mod_ssl/" MOD_SSL_VERSION;
+static const char var_interface[] = "mod_ssl/" AP_SERVER_BASEREVISION;
 static char var_library_interface[] = SSL_LIBRARY_TEXT;
 static char *var_library = NULL;
 
diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h
index 1de549a4062..89051adcd52 100644
--- a/modules/ssl/ssl_private.h
+++ b/modules/ssl/ssl_private.h
@@ -43,6 +43,7 @@
 #include "apr.h"
 #include "apr_strings.h"
 #define APR_WANT_STRFUNC
+#define APR_WANT_MEMFUNC
 #include "apr_want.h"
 #include "apr_tables.h"
 #include "apr_lib.h"
@@ -53,7 +54,9 @@
 #include "ap_socache.h"
 #include "mod_auth.h"
 
-#define MOD_SSL_VERSION AP_SERVER_BASEREVISION
+#ifdef APR_HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
 #ifndef FALSE
 #define FALSE 0
@@ -63,27 +66,10 @@
 #define TRUE !FALSE
 #endif
 
-#ifndef YY_NULL
-#define YY_NULL 0
-#endif
-
-#ifndef MIN
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#endif
-
 #ifndef BOOL
 #define BOOL unsigned int
 #endif
 
-#ifndef NULL
-#define NULL (void *)0
-#endif
-
-#ifndef NUL
-#define NUL '\0'
-#endif
-
-
 /* mod_ssl headers */
 #include "ssl_toolkit_compat.h"
 #include "ap_expr.h"