svn commit: r486477 - /incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c

[wr...@apache.org]

Author: wrowe
Date: Tue Dec 12 19:10:15 2006
New Revision: 486477

URL: http://svn.apache.org/viewvc?view=rev&rev=486477
Log:
Simple hack to the -compiler- knows rv is always initialized

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=486477&r1=486476&r2=486477
==============================================================================
--- incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ incubator/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Tue Dec 12 19:10:15 2006
@@ -70,8 +70,8 @@
                 
         if (res == APR_SUCCESS) {
             if (pollset[0].rtnevents & APR_POLLIN) {
-                /* activity on client socket, attempt an accept() */
-                rv = apr_socket_accept(&s, fc->csock, c->pool);
+                /* activity on client socket, fall through to accept() */
+                ;
             } 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
@@ -93,6 +93,9 @@
             fc->passive_created = -1;
             return APR_EGENERAL;
         }
+
+        /* activity on client socket, attempt an accept() */
+        rv = apr_socket_accept(&s, fc->csock, c->pool);
 
         /* fc->clientsa used for PORT, so assign it NULL for the PASV command. */
         fc->clientsa = NULL;