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/10/13 01:18:35 UTC
svn commit: r463542 - /incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c
Author: wrowe
Date: Thu Oct 12 18:18:34 2006
New Revision: 463542
URL: http://svn.apache.org/viewvc?view=rev&rev=463542
Log:
File 2 compatibility fixes for HTTP 2.2 / APR 1.2
Modified:
incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c
Modified: incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c?view=diff&rev=463542&r1=463541&r2=463542
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu Oct 12 18:18:34 2006
@@ -1382,7 +1382,7 @@
fc->passive_created = -1;
}
- rv = apr_socket_create(&s, APR_INET, SOCK_STREAM, c->pool);
+ rv = apr_socket_create_ex(&s, APR_INET, SOCK_STREAM, APR_PROTO_TCP, c->pool);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, c->base_server,
"Couldn't create passive socket");
@@ -1390,7 +1390,7 @@
}
rv = apr_socket_opt_set(s, APR_SO_LINGER,
- MAX_SECS_TO_LINGER);
+ APR_MAX_SECS_TO_LINGER);
if (rv != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_ERR, rv, c->base_server,
"Couldn't set APR_SO_LINGER socket option");
@@ -1590,7 +1590,7 @@
}
#endif
- rv = apr_socket_create(&s, APR_INET, SOCK_STREAM, c->pool);
+ rv = apr_socket_create_ex(&s, APR_INET, SOCK_STREAM, APR_PROTO_TCP, c->pool);
if (rv != APR_SUCCESS) {
#if !defined(WIN32) && !defined(HPUX)
if ((fsc->active_min != -1) && (fsc->active_min < 1024)) {