wrowe at apache
Jun 7, 2009, 10:36 PM
Post #1 of 1
(136 views)
Permalink
|
|
svn commit: r782531 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_commands.c ftp_data_connection.c ftp_inet_pton.c ftp_internal.h ftp_lowportd.c ftp_util.c
|
|
Author: wrowe
Date: Mon Jun 8 05:36:33 2009
New Revision: 782531
URL: http://svn.apache.org/viewvc?rev=782531&view=rev
Log:
ftp_internal.h does all this for us
Modified:
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c
httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Mon Jun 8 05:36:33 2009
@@ -32,15 +32,6 @@
#include <limits.h>
#endif
-#ifdef HAVE_FCHMOD
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#endif
-
/* Wish APR had one of these */
#if defined(WIN32) || defined(USE_WINSOCK)
#define FTP_APR_EADDRINUSE (APR_OS_START_SYSERR + WSAEADDRINUSE)
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Mon Jun 8 05:36:33 2009
@@ -24,9 +24,6 @@
#include "ftp_internal.h"
#include "apr_portable.h"
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c Mon Jun 8 05:36:33 2009
@@ -40,9 +40,6 @@
#include "ftp_internal.h"
#include "apr_network_io.h"
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
#if APR_HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_internal.h Mon Jun 8 05:36:33 2009
@@ -78,6 +78,10 @@
#include <unistd.h>
#endif
+#if APR_HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
#if APR_HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c Mon Jun 8 05:36:33 2009
@@ -30,13 +30,9 @@
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if APR_HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
+#if APR_HAVE_SYS_UN_H
#include <sys/un.h> /* for sockaddr_un */
+#endif
typedef struct lowportd_req_t {
pid_t ppid;
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_util.c?rev=782531&r1=782530&r2=782531&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Mon Jun 8 05:36:33 2009
@@ -25,10 +25,6 @@
#include "apr_fnmatch.h"
#include "ap_mpm.h" /* For MPM query interface */
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h> /* For file perms */
-#endif
-
/* Warning; the *arg is consumed, manipulated and must have the same lifetime
* as the desired *addr results!
*/
@@ -186,7 +182,7 @@
#endif
if (pattern && *pattern &&
- (apr_fnmatch(pattern, name, APR_FNM_PATHNAME | APR_FNM_PERIOD) != APR_SUCCESS)) {
+ (apr_fnmatch(pattern, name, APR_FNM_PATHNAME) != APR_SUCCESS)) {
#ifdef FTP_DEBUG
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "no match");
#endif
|
