svn commit: r1082202 - in /httpd/httpd/trunk/modules/ssl: ssl_engine_pphrase.c ssl_engine_vars.c ssl_private.h

[jo...@apache.org]

Author: jorton
Date: Wed Mar 16 16:51:46 2011
New Revision: 1082202

URL: http://svn.apache.org/viewvc?rev=1082202&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
    httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
    httpd/httpd/trunk/modules/ssl/ssl_private.h

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c?rev=1082202&r1=1082201&r2=1082202&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_pphrase.c Wed Mar 16 16:51:46 2011
@@ -747,8 +747,8 @@ int ssl_pphrase_Handle_CB(char *buf, int
          * 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");
         }

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c?rev=1082202&r1=1082201&r2=1082202&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c Wed Mar 16 16:51:46 2011
@@ -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;
 

Modified: httpd/httpd/trunk/modules/ssl/ssl_private.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_private.h?rev=1082202&r1=1082201&r2=1082202&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_private.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_private.h Wed Mar 16 16:51:46 2011
@@ -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"