You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/05/29 16:20:33 UTC
svn commit: r779989 - in /httpd/mod_ftp/trunk: CHANGES-FTP
modules/ftp/ftp_commands.c modules/ftp/ftp_lowportd.c
modules/ftp/ftp_protocol.c modules/ftp/ftp_protocol.h modules/ftp/ftp_util.c
Author: wrowe
Date: Fri May 29 14:20:32 2009
New Revision: 779989
URL: http://svn.apache.org/viewvc?rev=779989&view=rev
Log:
Backwards compatibility to 2.2
Modified:
httpd/mod_ftp/trunk/CHANGES-FTP
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
Modified: httpd/mod_ftp/trunk/CHANGES-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/CHANGES-FTP?rev=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/CHANGES-FTP (original)
+++ httpd/mod_ftp/trunk/CHANGES-FTP Fri May 29 14:20:32 2009
@@ -1,3 +1,7 @@
+Changes in 0.9.4:
+
+
+
Changes in 0.9.3:
*) Added a low-numbered port (<1024) daemon process which serves such
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=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Fri May 29 14:20:32 2009
@@ -20,6 +20,7 @@
* FTP Protocol module for Apache 2.0
*/
+#define CORE_PRIVATE
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_version.h"
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=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c Fri May 29 14:20:32 2009
@@ -14,12 +14,14 @@
* limitations under the License.
*/
+#define CORE_PRIVATE
#include "mod_ftp.h"
#include "ftp_internal.h"
#include "apr_signal.h"
#include "ap_listen.h"
#include "ap_mpm.h"
#include "unixd.h"
+#include "mpm.h"
/* The module is enabled by the presence of unix domain sockets */
#if APR_HAVE_SYS_UN_H
@@ -315,7 +317,11 @@
}
if (!geteuid()) {
+#if AP_SERVER_MAJORVERSION_NUMBER < 3 && AP_SERVER_MINORVERSION_NUMBER < 3
+ if (chown(sockname, unixd_config.user_id, -1) < 0) {
+#else
if (chown(sockname, ap_unixd_config.user_id, -1) < 0) {
+#endif
ap_log_error(APLOG_MARK, APLOG_ERR, errno, main_server,
"Couldn't change owner of unix domain socket %s",
sockname);
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Fri May 29 14:20:32 2009
@@ -20,6 +20,7 @@
* FTP Protocol module for Apache 2.0
*/
+#define CORE_PRIVATE
#include "mod_ftp.h"
#include "ftp_internal.h"
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h?rev=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.h Fri May 29 14:20:32 2009
@@ -6,7 +6,7 @@
* another gmake (or a make ftp_protocol.h)
*
* Generated from ../.. on
- * Fri May 29 04:08:55 2009
+ * Fri May 29 14:12:09 2009
*/
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=779989&r1=779988&r2=779989&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Fri May 29 14:20:32 2009
@@ -185,7 +185,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