httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r646229 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_connection.c ftp_protocol.c
Date Wed, 09 Apr 2008 08:48:22 GMT
Author: wrowe
Date: Wed Apr  9 01:48:19 2008
New Revision: 646229

URL: http://svn.apache.org/viewvc?rev=646229&view=rev
Log:
Per httpd/trunk r440337 - "Replace ap_get_server_version with ap_get_server_banner"
mod_ftp must call ap_get_server_banner for httpd 2.3+.

PR: 44747
Submitted by: Tom Donovan <Tom.Donovan acm.org>

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
    httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=646229&r1=646228&r2=646229&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Wed Apr  9 01:48:19 2008
@@ -150,7 +150,11 @@
                    FTP_REPLY_SERVICE_READY, 0,
                    "%s FTP Server (%s) ready.",
                    fc->orig_server->server_hostname,
+#if AP_MODULE_MAGIC_AT_LEAST(20060905,0)
+                   ap_get_server_banner());
+#else
                    ap_get_server_version());
+#endif
     return rv;
 }
 

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=646229&r1=646228&r2=646229&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Wed Apr  9 01:48:19 2008
@@ -742,7 +742,13 @@
     case FTP_REPLY_SYSTEM_TYPE:
         ftp_reply(fc, c->output_filters, r->pool, FTP_REPLY_SYSTEM_TYPE, 0,
                   apr_pstrcat(r->pool, "UNIX Type: L8 System: \"",
-                              ap_get_server_version(), "\"", NULL));
+#if AP_MODULE_MAGIC_AT_LEAST(20060905,0)
+                                       ap_get_server_banner(),
+
+#else
+                                       ap_get_server_version(),
+#endif
+                                       "\"", NULL));
         break;
     case FTP_REPLY_CONTROL_CLOSE:
         fsc = ftp_get_module_config(r->server->module_config);



Mime
View raw message