diff options
| author | Jeff Trawick <trawick@apache.org> | 2001-04-27 18:02:21 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2001-04-27 18:02:21 +0000 |
| commit | 464de0abc146645170bdc59046ccf2a9791883ab (patch) | |
| tree | 8af20c0b917501d0a529b18f31157f7540cef57e /modules/tls | |
| parent | afefe6fa3a357a3abb899082b4889920375dc7e0 (diff) | |
| download | httpd-464de0abc146645170bdc59046ccf2a9791883ab.tar.gz | |
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
Diffstat (limited to 'modules/tls')
| -rw-r--r-- | modules/tls/mod_tls.c | 6 | ||||
| -rw-r--r-- | modules/tls/openssl_state_machine.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/modules/tls/mod_tls.c b/modules/tls/mod_tls.c index aa764833df..1787e94b00 100644 --- 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 82c86a404a..171a1aa23d 100644 --- 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" |