Get mod_tls to compile/work better on Windows.

PR:           7612
Submitted by: Bernhard Schrenk <b.schrenk@improx.com>
Reviewed by:  Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 6a8a4a62ca4a8b0e71e8d19dbfedc244dc5c4a21..a793518af11b911be306455edf2a7f99a711df87 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.18-dev
 
+  *) Get mod_tls to compile/work better on Windows.  PR #7612
+     [Bernhard Schrenk <b.schrenk@improx.com>]
+
   *) Fix shutdown/restart hangs in the threaded MPM.
      [Jeff Trawick, Greg Ames, Ryan Bloom]
   

diff --git a/modules/tls/mod_tls.c b/modules/tls/mod_tls.c
index aa764833dfe70aff3b3a515affbaa5e859cb379d..1787e94b0065fe789ffde12072e3136648f9224f 100644 (file)
--- a/modules/tls/mod_tls.c
+++ b/modules/tls/mod_tls.c
@@ -68,7 +68,7 @@
 /* temp */
 #include <assert.h>
 
-AP_DECLARE_DATA module tls_module;
+module AP_MODULE_DECLARE_DATA tls_module;
 static const char s_szTLSFilterName[]="TLSFilter";
 typedef struct
 {
@@ -235,7 +235,7 @@ static apr_status_t churn(TLSFilterCtx *pCtx,apr_read_type_e eReadType,apr_size_
                ap_log_error(APLOG_MARK,APLOG_ERR,ret,NULL,
                             "Read failed in tls_in_filter");
            assert(eReadType == APR_NONBLOCK_READ);
-           assert(ret == APR_SUCCESS || ret == APR_EAGAIN);
+           assert(ret == APR_SUCCESS || ret == APR_STATUS_IS_EAGAIN(ret));
            /* In this case, we have data in the output bucket, or we were
             * non-blocking, so returning nothing is fine.
             */
@@ -406,7 +406,7 @@ static void register_hooks(apr_pool_t *p)
     ap_hook_http_method(tls_method,NULL,NULL,APR_HOOK_MIDDLE);
 }
 
-AP_DECLARE_DATA module tls_module = {
+module AP_MODULE_DECLARE_DATA tls_module = {
     STANDARD20_MODULE_STUFF,
     NULL,                      /* create per-directory config structure */
     NULL,                      /* merge per-directory config structures */

diff --git a/modules/tls/openssl_state_machine.c b/modules/tls/openssl_state_machine.c
index 82c86a404aa95c1e450b19018260cf6e8c3fa42e..171a1aa23dae51e3b052132a0d95d56744ce2d80 100644 (file)
--- a/modules/tls/openssl_state_machine.c
+++ b/modules/tls/openssl_state_machine.c
@@ -76,9 +76,13 @@
  *
  * This implementation acts as a server, but it can also be done for a client.  */
 
+#include "apr.h"
+
 #include <openssl/ssl.h>
 #include <assert.h>
+#if APR_HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <openssl/err.h>
 #include "openssl_state_machine.h"