manoj 99/10/25 23:05:39
Modified: src/modules/mpm/mpmt_pthread mpmt_pthread.c
Log:
Fix warnings from the local/remote_addr stuff properly.
Revision Changes Path
1.41 +3 -11 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.40
retrieving revision 1.41
diff -u -d -u -r1.40 -r1.41
--- mpmt_pthread.c 1999/10/25 23:16:29 1.40
+++ mpmt_pthread.c 1999/10/26 06:05:38 1.41
@@ -725,10 +725,8 @@
* Child process main loop.
*/
-static void process_socket(ap_context_t *p, struct sockaddr *sa_client,
ap_socket_t *sock, int my_child_num, int my_thread_num)
+static void process_socket(ap_context_t *p, ap_socket_t *sock, int
my_child_num, int my_thread_num)
{
- struct sockaddr sa_server; /* ZZZZ */
- size_t len = sizeof(struct sockaddr);
BUFF *conn_io;
conn_rec *current_conn;
ap_iol *iol;
@@ -737,12 +735,6 @@
(void) ap_get_os_sock(&csd, sock);
- if (getsockname(csd, &sa_server, &len) < 0) {
- ap_log_error(APLOG_MARK, APLOG_ERR, errno, server_conf, "getsockname");
- close(csd);
- return;
- }
-
sock_disable_nagle(csd);
iol = unix_attach_socket(csd);
@@ -800,7 +792,6 @@
int process_slot = ti->pid;
int thread_slot = ti->tid;
ap_context_t *tpool = ti->tpool;
- struct sockaddr sa_client;
ap_socket_t *csd = NULL;
ap_context_t *ptrans; /* Pool for per-transaction stuff */
ap_socket_t *sd = NULL;
@@ -894,7 +885,7 @@
SAFE_ACCEPT(intra_mutex_off(0));
break;
}
- process_socket(ptrans, &sa_client, csd, process_slot, thread_slot);
+ process_socket(ptrans, csd, process_slot, thread_slot);
ap_clear_pool(ptrans);
requests_this_child--;
}
@@ -919,6 +910,7 @@
{
sigset_t sig_mask;
int signal_received;
+ pthread_t thread;
pthread_attr_t thread_attr;
int i;
int my_child_num = child_num_arg;
