httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/netware mod_nw_ssl.c
Date Tue, 29 Oct 2002 05:25:51 GMT
wrowe       2002/10/28 21:25:51

  Modified:    modules/arch/netware mod_nw_ssl.c
  Log:
    On an errno rampage... ap_log_error takes an apr_status_t
  
  Revision  Changes    Path
  1.7       +13 -13    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_nw_ssl.c	14 Oct 2002 00:12:02 -0000	1.6
  +++ mod_nw_ssl.c	29 Oct 2002 05:25:51 -0000	1.7
  @@ -182,7 +182,7 @@
   
   
   static int make_secure_socket(apr_pool_t *pconf, const struct sockaddr_in *server,
  -                              char* key, int mutual, server_rec *server_conf)
  +                              char* key, int mutual, server_rec *sconf)
   {
       int s;
       int one = 1;
  @@ -210,9 +210,9 @@
               (LPWSAPROTOCOL_INFO)&SecureProtoInfo, 0, 0);
               
       if (s == INVALID_SOCKET) {
  -        errno = WSAGetLastError();
  -        ap_log_error(APLOG_MARK, APLOG_CRIT, errno, server_conf,
  -            "make_secure_socket: failed to get a socket for %s", addr);
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +                     "make_secure_socket: failed to get a socket for %s", 
  +                     addr);
           return -1;
       }
           
  @@ -221,9 +221,9 @@
   		    
           if (WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam,
               sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
  -            errno = WSAGetLastError();
  -            ap_log_error(APLOG_MARK, APLOG_CRIT, errno, server_conf,
  -                "make_secure_socket: for %s, WSAIoctl: (SO_SSL_SET_FLAGS)", addr);
  +            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +                         "make_secure_socket: for %s, WSAIoctl: "
  +                         "(SO_SSL_SET_FLAGS)", addr);
               return -1;
           }
       }
  @@ -236,9 +236,9 @@
   
       if (WSAIoctl(s, SO_SSL_SET_SERVER, (char *)&opts, sizeof(opts),
           NULL, 0, NULL, NULL, NULL) != 0) {
  -        errno = WSAGetLastError();
  -        ap_log_error(APLOG_MARK, APLOG_CRIT, errno, server_conf,
  -            "make_secure_socket: for %s, WSAIoctl: (SO_SSL_SET_SERVER)", addr);
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +                     "make_secure_socket: for %s, WSAIoctl: "
  +                     "(SO_SSL_SET_SERVER)", addr);
           return -1;
       }
   
  @@ -247,9 +247,9 @@
   
           if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam,
               sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
  -            errno = WSAGetLastError();
  -            ap_log_error( APLOG_MARK, APLOG_CRIT, errno, server_conf,
  -                "make_secure_socket: for %s, WSAIoctl: (SO_SSL_SET_FLAGS)", addr );
  +            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +                         "make_secure_socket: for %s, WSAIoctl: "
  +                         "(SO_SSL_SET_FLAGS)", addr);
               return -1;
           }
       }
  
  
  

Mime
View raw message