manoj 99/10/26 23:11:22
Modified: src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c
Log:
Only process a connection if we've actually accepted one.
Revision Changes Path
1.48 +2 -2 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -u -r1.47 -r1.48
--- dexter.c 1999/10/26 06:07:36 1.47
+++ dexter.c 1999/10/27 06:11:19 1.48
@@ -936,6 +936,8 @@
}
}
pthread_mutex_unlock(&idle_thread_count_mutex);
+ process_socket(ptrans, csd, conn_id);
+ requests_this_child--;
} else {
SAFE_ACCEPT(accept_mutex_off(0));
SAFE_ACCEPT(intra_mutex_off(0));
@@ -944,9 +946,7 @@
pthread_mutex_unlock(&idle_thread_count_mutex);
break;
}
- process_socket(ptrans, csd, conn_id);
ap_clear_pool(ptrans);
- requests_this_child--;
}
ap_destroy_pool(tpool);
1.42 +2 -2 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -u -r1.41 -r1.42
--- mpmt_pthread.c 1999/10/26 06:05:38 1.41
+++ mpmt_pthread.c 1999/10/27 06:11:21 1.42
@@ -879,15 +879,15 @@
ap_accept(&csd, sd, ptrans);
SAFE_ACCEPT(accept_mutex_off(0));
SAFE_ACCEPT(intra_mutex_off(0));
+ process_socket(ptrans, csd, process_slot, thread_slot);
+ requests_this_child--;
}
else {
SAFE_ACCEPT(accept_mutex_off(0));
SAFE_ACCEPT(intra_mutex_off(0));
break;
}
- process_socket(ptrans, csd, process_slot, thread_slot);
ap_clear_pool(ptrans);
- requests_this_child--;
}
ap_destroy_pool(tpool);
