You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@hyperreal.org on 1999/10/19 16:55:37 UTC
cvs commit: apache-2.0/src/modules/mpm/winnt winnt.h winnt.c
stoddard 99/10/19 07:55:36
Modified: src/modules/mpm/winnt winnt.h winnt.c
Log:
Fix GetAcceptExSockaddrs plus a few tweaks.
Revision Changes Path
1.5 +2 -2 apache-2.0/src/modules/mpm/winnt/winnt.h
Index: winnt.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/winnt/winnt.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- winnt.h 1999/10/08 19:07:05 1.4
+++ winnt.h 1999/10/19 14:55:35 1.5
@@ -73,9 +73,9 @@
char *recv_buf;
int recv_buf_size;
ap_context_t *ptrans;
- struct sockaddr sa_server;
+ struct sockaddr *sa_server;
int sa_server_len;
- struct sockaddr sa_client;
+ struct sockaddr *sa_client;
int sa_client_len;
} COMP_CONTEXT, *PCOMP_CONTEXT;
#if 0
1.23 +4 -6 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- winnt.c 1999/10/13 18:16:50 1.22
+++ winnt.c 1999/10/19 14:55:35 1.23
@@ -745,7 +745,6 @@
context->accept_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
ap_create_context(&context->ptrans, p);
-// context->ptrans = ap_make_sub_pool(p);
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;
@@ -829,7 +828,7 @@
ap_unlock(allowed_globals.jobmutex);
context->conn_io->incnt = BytesRead;
-/*
+
GetAcceptExSockaddrs(context->conn_io->inbase,
context->conn_io->bufsiz - 2*PADDED_ADDR_SIZE,
PADDED_ADDR_SIZE,
@@ -839,7 +838,6 @@
&context->sa_client,
&context->sa_client_len);
-*/
return context;
/*
CloseHandle(context->Overlapped.hEvent);
@@ -1095,11 +1093,11 @@
child_handles[i] = create_thread((void (*)(void *)) child_main, (void *) i);
}
- /* Create an AcceptEx context for each listener and queue it to the
- * AcceptEx completion port
+ /* Create 3 AcceptEx contexts for each listener then queue them to the
+ * AcceptEx completion port.
*/
for (lr = ap_listeners; lr != NULL; lr = lr->next) {
- for(i=0; i<1; i++) {
+ for(i=0; i<2; i++) {
if (create_and_queue_completion_context(pconf, lr) == -1) {
/* log error and exit */
}