You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2004/03/06 15:50:55 UTC
cvs commit: httpd-2.0/include mpm_common.h
jorton 2004/03/06 06:50:55
Modified: server mpm_common.c
include mpm_common.h
Log:
* include/mpm_common.h (ap_pod_t): Remove 'sa' field.
* server/mpm_common.c (ap_mpm_pod_open, dummy_connection): Use
ap_listeners->bind_addr for the dummy connection rather than doing a
name lookup on the first listener's hostname and using one of the
addresses returned.
PR: 27313
Revision Changes Path
1.118 +3 -5 httpd-2.0/server/mpm_common.c
Index: mpm_common.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm_common.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -w -d -u -r1.117 -r1.118
--- mpm_common.c 25 Feb 2004 11:55:31 -0000 1.117
+++ mpm_common.c 6 Mar 2004 14:50:55 -0000 1.118
@@ -366,9 +366,6 @@
apr_file_pipe_timeout_set((*pod)->pod_in, 0);
(*pod)->p = p;
- apr_sockaddr_info_get(&(*pod)->sa, ap_listeners->bind_addr->hostname,
- APR_UNSPEC, ap_listeners->bind_addr->port, 0, p);
-
/* close these before exec. */
apr_file_inherit_unset((*pod)->pod_in);
apr_file_inherit_unset((*pod)->pod_out);
@@ -444,7 +441,8 @@
return rv;
}
- rv = apr_socket_create(&sock, pod->sa->family, SOCK_STREAM, 0, p);
+ rv = apr_socket_create(&sock, ap_listeners->bind_addr->family,
+ SOCK_STREAM, 0, p);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_WARNING, rv, ap_server_conf,
"get socket to connect to listener");
@@ -467,7 +465,7 @@
return rv;
}
- rv = apr_socket_connect(sock, pod->sa);
+ rv = apr_socket_connect(sock, ap_listeners->bind_addr);
if (rv != APR_SUCCESS) {
int log_level = APLOG_WARNING;
1.47 +0 -1 httpd-2.0/include/mpm_common.h
Index: mpm_common.h
===================================================================
RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -w -d -u -r1.46 -r1.47
--- mpm_common.h 19 Feb 2004 11:19:43 -0000 1.46
+++ mpm_common.h 6 Mar 2004 14:50:55 -0000 1.47
@@ -139,7 +139,6 @@
apr_file_t *pod_in;
apr_file_t *pod_out;
apr_pool_t *p;
- apr_sockaddr_t *sa;
};
/**