httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/mpm/winnt winnt.c
Date Wed, 03 Nov 1999 02:38:44 GMT
stoddard    99/11/02 18:38:43

  Modified:    src/modules/mpm/winnt winnt.c
  Log:
  Fix bug setting localaddr and remoteaddr
  
  Revision  Changes    Path
  1.27      +8 -9      apache-2.0/src/modules/mpm/winnt/winnt.c
  
  Index: winnt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- winnt.c	1999/11/02 22:04:14	1.26
  +++ winnt.c	1999/11/03 02:38:42	1.27
  @@ -801,7 +801,7 @@
           return -1;
       }
       ap_create_context(&context->ptrans, p);
  -    context->conn_io =  ap_bcreate(context->ptrans, B_RDWR);
  +    context->conn_io = ap_bcreate(context->ptrans, B_RDWR);
       context->recv_buf = context->conn_io->inbase;
       context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE;
       ap_get_os_sock(&nsd, context->lr->sd);
  @@ -846,7 +846,8 @@
       context->recv_buf_size = context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE;
       ap_get_os_sock(&nsd, context->lr->sd);
   
  -    if (!AcceptEx(nsd, context->accept_socket, 
  +    if (!AcceptEx(nsd, 
  +                  context->accept_socket, 
                     context->recv_buf, context->recv_buf_size,
                     PADDED_ADDR_SIZE, PADDED_ADDR_SIZE,
                     &BytesRead, (LPOVERLAPPED) context)) {
  @@ -902,8 +903,8 @@
   
       context->conn_io->incnt = BytesRead;
   
  -    GetAcceptExSockaddrs(context->conn_io->inbase, 
  -                         context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE,
  +    GetAcceptExSockaddrs(context->recv_buf, 
  +                         context->recv_buf_size,
                            PADDED_ADDR_SIZE,
                            PADDED_ADDR_SIZE,
                            &context->sa_server,
  @@ -968,12 +969,10 @@
               closesocket(context->accept_socket);
               continue;
           }
  -
           ap_bpush_iol(context->conn_io, iol);
  -
  -	current_conn = ap_new_connection(context->ptrans, server_conf, context->conn_io,
  -                                         (struct sockaddr_in *) &context->sa_client,
  -                                         (struct sockaddr_in *) &context->sa_server,
  +        current_conn = ap_new_connection(context->ptrans, server_conf, context->conn_io,
  +                                         (struct sockaddr_in *) context->sa_client,
  +                                         (struct sockaddr_in *) context->sa_server,
                                            child_num);
   
           ap_process_connection(current_conn);
  
  
  

Mime
View raw message