Commit b7033f02 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent bb787f31

CHANGES

+3 −0
Original line number Diff line number Diff line 
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]

modules/tls/mod_tls.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */

modules/tls/openssl_state_machine.c

+4 −0
Original line number Diff line number Diff line
@@ -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"