svn commit: r355820 - /incubator/mod_ftp/trunk/src/ftp_connection.c

[wr...@apache.org]

Author: wrowe
Date: Sat Dec 10 16:14:20 2005
New Revision: 355820

URL: http://svn.apache.org/viewcvs?rev=355820&view=rev
Log:

  Be a bit more informative if we can't play with the socket fd

Modified:
    incubator/mod_ftp/trunk/src/ftp_connection.c

Modified: incubator/mod_ftp/trunk/src/ftp_connection.c
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/src/ftp_connection.c?rev=355820&r1=355819&r2=355820&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/src/ftp_connection.c (original)
+++ incubator/mod_ftp/trunk/src/ftp_connection.c Sat Dec 10 16:14:20 2005
@@ -69,6 +69,11 @@
                                          &core_module);
     apr_socket_timeout_set(client_socket, cdata->base_server->timeout);
 
+    if (rv != APR_SUCCESS) {
+        ap_log_error(APLOG_MARK, APLOG_ERR, rv, cdata->base_server,
+                     "Failed to set socket timeout");
+    }
+
     bb = apr_brigade_create(cdata->pool, cdata->bucket_alloc);
     rv = ap_get_brigade(cdata->input_filters, bb, AP_MODE_INIT,
                         APR_BLOCK_READ, 0);
@@ -76,7 +81,7 @@
 
     if (rv != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, rv, cdata->base_server,
-                     "Couldn't set SO_NONBLOCK socket option");
+                     "Failed to initialize the ftp ssl data stream");
     }
     
     return rv;