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/server/mpm/netware mpm_netware.c
Date Tue, 16 Mar 2004 03:09:59 GMT
bnicholes    2004/03/15 19:09:59

  Modified:    modules/arch/netware Tag: APACHE_2_0_BRANCH mod_nw_ssl.c
               server/mpm/netware Tag: APACHE_2_0_BRANCH mpm_netware.c
  Log:
  Report the NetWare socket error since we are using native socket calls
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.10  +4 -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.7.2.9
  retrieving revision 1.7.2.10
  diff -u -r1.7.2.9 -r1.7.2.10
  --- mod_nw_ssl.c	7 Mar 2004 03:24:15 -0000	1.7.2.9
  +++ mod_nw_ssl.c	16 Mar 2004 03:09:59 -0000	1.7.2.10
  @@ -220,7 +220,7 @@
               (LPWSAPROTOCOL_INFO)&SecureProtoInfo, 0, 0);
               
       if (s == INVALID_SOCKET) {
  -        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
                        "make_secure_socket: failed to get a socket for %s", 
                        addr);
           return -1;
  @@ -231,7 +231,7 @@
   		    
           if (WSAIoctl(s, SO_SSL_SET_FLAGS, (char *)&optParam,
               sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
  -            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +            ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
                            "make_secure_socket: for %s, WSAIoctl: "
                            "(SO_SSL_SET_FLAGS)", addr);
               return -1;
  @@ -246,7 +246,7 @@
   
       if (WSAIoctl(s, SO_SSL_SET_SERVER, (char *)&opts, sizeof(opts),
           NULL, 0, NULL, NULL, NULL) != 0) {
  -        ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +        ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
                        "make_secure_socket: for %s, WSAIoctl: "
                        "(SO_SSL_SET_SERVER)", addr);
           return -1;
  @@ -257,7 +257,7 @@
   
           if(WSAIoctl(s, SO_SSL_SET_FLAGS, (char*)&optParam,
               sizeof(optParam), NULL, 0, NULL, NULL, NULL)) {
  -            ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), sconf,
  +            ap_log_error(APLOG_MARK, APLOG_CRIT, WSAGetLastError(), sconf,
                            "make_secure_socket: for %s, WSAIoctl: "
                            "(SO_SSL_SET_FLAGS)", addr);
               return -1;
  
  
  
  No                   revision
  No                   revision
  1.62.2.18 +1 -1      httpd-2.0/server/mpm/netware/mpm_netware.c
  
  Index: mpm_netware.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/netware/mpm_netware.c,v
  retrieving revision 1.62.2.17
  retrieving revision 1.62.2.18
  diff -u -r1.62.2.17 -r1.62.2.18
  --- mpm_netware.c	9 Feb 2004 20:59:48 -0000	1.62.2.17
  +++ mpm_netware.c	16 Mar 2004 03:09:59 -0000	1.62.2.18
  @@ -385,7 +385,7 @@
   
               if (srv <= 0) {
                   if (srv < 0) {
  -                    ap_log_error(APLOG_MARK, APLOG_NOTICE, apr_get_netos_error(), ap_server_conf,
  +                    ap_log_error(APLOG_MARK, APLOG_NOTICE, WSAGetLastError(), ap_server_conf,
                           "select() failed on listen socket");
                       apr_thread_yield();
                   }
  
  
  

Mime
View raw message