You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mod_ftp-commits@incubator.apache.org by wr...@apache.org on 2006/12/08 21:45:27 UTC
svn commit: r484800 -
/incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
Author: wrowe
Date: Fri Dec 8 13:45:25 2006
New Revision: 484800
URL: http://svn.apache.org/viewvc?view=rev&rev=484800
Log:
Modern APR syntax
Modified:
incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
Modified: incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?view=diff&rev=484800&r1=484799&r2=484800
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Fri Dec 8 13:45:25 2006
@@ -71,7 +71,7 @@
if (res == APR_SUCCESS) {
if (pollset[0].rtnevents & APR_POLLIN) {
/* activity on client socket, attempt an accept() */
- rv = apr_accept(&s, fc->csock, c->pool);
+ rv = apr_socket_accept(&s, fc->csock, c->pool);
} else if (pollset[1].rtnevents & (APR_POLLIN | APR_POLLPRI)) {
/* command channel has activity. since we can only do
* a single read ahead operation, no use in looping here
@@ -117,7 +117,7 @@
if (fc->clientsa) {
int tries;
for (tries = 0;; tries++) {
- rv = apr_connect(fc->csock, fc->clientsa);
+ rv = apr_socket_connect(fc->csock, fc->clientsa);
if (rv == APR_SUCCESS) {
break;
}