Attachment #35747 for bug #62145

View | Details | Raw Unified | Return to bug 62145
Collapse All | Expand All

Lines 1583-1589 static int proxy_ftp_handler(request_rec r, proxy_worker worker, Link Here

(-)a/modules/proxy/mod_proxy_ftp.c (-2 / +10 lines)
1583	}	1583	}
1584		1584
1585	/* make the connection */	1585	/* make the connection */
1586	apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), connect_addr->family, pasvport, 0, p);	1586	rv = apr_sockaddr_info_get(&pasv_addr, apr_psprintf(p, "%d.%d.%d.%d", h3, h2, h1, h0), connect_addr->family, pasvport, 0, p);
		1587	if (rv != APR_SUCCESS) {
		1588	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
		1589	"failed to set up sockaddr");
		1590	}
1587	rv = apr_socket_connect(data_sock, pasv_addr);	1591	rv = apr_socket_connect(data_sock, pasv_addr);
1588	if (rv != APR_SUCCESS) {	1592	if (rv != APR_SUCCESS) {
1589	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01048)	1593	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01048)
Lines 1628-1634 static int proxy_ftp_handler(request_rec r, proxy_worker worker, Link Here
1628	#endif /* _OSD_POSIX */	1632	#endif /* _OSD_POSIX */
1629	}	1633	}
1630		1634
1631	apr_sockaddr_info_get(&local_addr, local_ip, APR_UNSPEC, local_port, 0, r->pool);	1635	rv = apr_sockaddr_info_get(&local_addr, local_ip, APR_UNSPEC, local_port, 0, r->pool);
		1636	if (rv != APR_SUCCESS) {
		1637	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO()
		1638	"failed to set up sockaddr for %s", local_ip);
		1639	}
1632		1640
1633	if ((rv = apr_socket_bind(local_sock, local_addr)) != APR_SUCCESS) {	1641	if ((rv = apr_socket_bind(local_sock, local_addr)) != APR_SUCCESS) {
1634	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01051)	1642	ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01051)

Lines 2331-2337 ap_proxy_determine_connection(apr_pool_t p, request_rec r, Link Here

(-)a/modules/proxy/proxy_util.c (-1 / +4 lines)
2331	*/	2331	*/
2332	if (!conn->addr) {	2332	if (!conn->addr) {
2333	apr_sockaddr_t *sa;	2333	apr_sockaddr_t *sa;
2334	apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, conn->pool);	2334	if (apr_sockaddr_info_get(&sa, NULL, APR_UNSPEC, 0, 0, conn->pool) != APR_SUCCESS) {
		2335	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO()
		2336	"failed to set up sockaddr");
		2337	}
2335	conn->addr = sa;	2338	conn->addr = sa;
2336	}	2339	}
2337	conn->hostname = "httpd-UDS";	2340	conn->hostname = "httpd-UDS";

Lines 883-889 AP_DECLARE(apr_status_t) ap_duplicate_listeners(apr_pool_t p, server_rec s, Link Here

(-)a/server/listen.c (-1 / +7 lines)
883	duplr->protocol = apr_pstrdup(p, lr->protocol);	883	duplr->protocol = apr_pstrdup(p, lr->protocol);
884	hostname = apr_pstrdup(p, lr->bind_addr->hostname);	884	hostname = apr_pstrdup(p, lr->bind_addr->hostname);
885	port = lr->bind_addr->port;	885	port = lr->bind_addr->port;
886	apr_sockaddr_info_get(&sa, hostname, APR_UNSPEC, port, 0, p);	886	stat = apr_sockaddr_info_get(&sa, hostname, APR_UNSPEC, port, 0, p);
		887	if (stat != APR_SUCCESS) {
		888	ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, p, APLOGNO()
		889	"ap_duplicate_listeners: failed to set up sockaddr for %s",
		890	hostname);
		891	return stat;
		892	}
887	duplr->bind_addr = sa;	893	duplr->bind_addr = sa;
888	duplr->next = NULL;	894	duplr->next = NULL;
889	stat = apr_socket_create(&duplr->sd, duplr->bind_addr->family,	895	stat = apr_socket_create(&duplr->sd, duplr->bind_addr->family,

Return to bug 62145