httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bnicho...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/netware mod_nw_ssl.c
Date Mon, 02 Jun 2003 15:24:30 GMT
bnicholes    2003/06/02 08:24:30

  Modified:    modules/arch/netware mod_nw_ssl.c
  Log:
  Allow for an unclean shutdown of SSL ports to avoid timeout conditions
  between the client and the server.
  
  Revision  Changes    Path
  1.12      +17 -4     httpd-2.0/modules/arch/netware/mod_nw_ssl.c
  
  Index: mod_nw_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/netware/mod_nw_ssl.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- mod_nw_ssl.c	8 May 2003 16:08:43 -0000	1.11
  +++ mod_nw_ssl.c	2 Jun 2003 15:24:30 -0000	1.12
  @@ -89,6 +89,10 @@
   #include "apr_portable.h"
   #include "apr_optional.h"
   
  +#ifndef SO_TLS_UNCLEAN_SHUTDOWN
  +#define SO_TLS_UNCLEAN_SHUTDOWN 0
  +#endif
  +
   APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
   APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
   
  @@ -266,7 +270,7 @@
       }
   
       if (mutual) {
  -        optParam = 0x07;               // SO_SSL_AUTH_CLIENT
  +        optParam = 0x07;  // SO_SSL_AUTH_CLIENT
   
           if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam,
               sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
  @@ -277,6 +281,10 @@
           }
       }
   
  +    optParam = SO_TLS_UNCLEAN_SHUTDOWN;
  +    WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam, sizeof(optParam), 
  +             NULL, 0, NULL, NULL, NULL);
  +
       return s;
   }
   
  @@ -307,6 +315,10 @@
   		return rcode;
   	}
   
  +    ulFlags = SO_TLS_UNCLEAN_SHUTDOWN;
  +	WSAIoctl(sock, SO_TLS_SET_FLAGS, &ulFlags, sizeof(unsigned long),
  +                     NULL, 0, NULL, NULL, NULL);
  +
       /* setup the socket for SSL */
       memset (&sWS2Opts, 0, sizeof(sWS2Opts));
       memset (&sNWTLSOpts, 0, sizeof(sNWTLSOpts));
  @@ -526,12 +538,13 @@
   
   static int nwssl_hook_Fixup(request_rec *r)
   {
  -    apr_table_t *e = r->subprocess_env;    
  +    int i;
  +
       if (!isSecure(r))
           return DECLINED;
   
  -    apr_table_set(e, "HTTPS", "on");
  -    
  +    apr_table_set(r->subprocess_env, "HTTPS", "on");
  +
       return DECLINED;
   }
   
  
  
  

Mime
View raw message