You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/04/27 20:02:22 UTC
cvs commit: httpd-2.0/modules/tls mod_tls.c openssl_state_machine.c
trawick 01/04/27 11:02:22
Modified: . CHANGES
modules/tls mod_tls.c openssl_state_machine.c
Log:
Get mod_tls to compile/work better on Windows.
PR: 7612
Submitted by: Bernhard Schrenk <b....@improx.com>
Reviewed by: Jeff Trawick
Revision Changes Path
1.187 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- CHANGES 2001/04/26 18:52:28 1.186
+++ CHANGES 2001/04/27 18:02:18 1.187
@@ -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....@improx.com>]
+
*) Fix shutdown/restart hangs in the threaded MPM.
[Jeff Trawick, Greg Ames, Ryan Bloom]
1.10 +3 -3 httpd-2.0/modules/tls/mod_tls.c
Index: mod_tls.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/tls/mod_tls.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_tls.c 2001/04/27 15:16:41 1.9
+++ mod_tls.c 2001/04/27 18:02:20 1.10
@@ -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 @@
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 @@
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 */
1.4 +4 -0 httpd-2.0/modules/tls/openssl_state_machine.c
Index: openssl_state_machine.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/tls/openssl_state_machine.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openssl_state_machine.c 2001/02/18 02:10:27 1.3
+++ openssl_state_machine.c 2001/04/27 18:02:21 1.4
@@ -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"