svn commit: r614111 - in /httpd/mod_ftp/trunk/modules/ftp: ftp_util.c mod_ftp.c

[wr...@apache.org]

Author: wrowe
Date: Mon Jan 21 20:31:00 2008
New Revision: 614111

URL: http://svn.apache.org/viewvc?rev=614111&view=rev
Log:
Fix ap_get_scoreboard_worker_from_indexes for post-2.2 API,
and drop Require dir-name with post-2.2 API for now, because 
this must be either refactored for the new auth conf stuff,
or implemented as a distinct module (preferable, if possible). 

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
    httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c

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=614111&r1=614110&r2=614111&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Mon Jan 21 20:31:00 2008
@@ -602,7 +602,11 @@
 
     for (i = 0; i < hard_server_limit; i++) {
         for (j = 0; j < hard_thread_limit; j++) {
+#if ((AP_SERVER_MAJORVERSION_NUMBER < 3) && (AP_SERVER_MINORVERSION_NUMBER < 3))
             scoreboard = ap_get_scoreboard_worker(i, j);
+#else
+            scoreboard = ap_get_scoreboard_worker_from_indexes(i, j);
+#endif
             if (scoreboard->status == SERVER_READY)
                 return 0;
         }

Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=614111&r1=614110&r2=614111&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Mon Jan 21 20:31:00 2008
@@ -321,6 +321,7 @@
     return NULL;
 }
 
+#if ((AP_SERVER_MAJORVERSION_NUMBER < 3) && (AP_SERVER_MINORVERSION_NUMBER < 3))
 /*
  * The check_user_id hook.  This is a hack that allows us to ensure that only
  * the owner of the directory can get access to the current directory.  If the
@@ -378,6 +379,7 @@
 
     return DECLINED;
 }
+#endif /* AP_VERSION > 2.2 */
 
 /*
  * Handle FTP module directives
@@ -908,8 +910,11 @@
     ap_hook_process_connection(ftp_process_connection, NULL, NULL,
                                APR_HOOK_MIDDLE);
     ap_hook_create_request(ftp_create_request,NULL,NULL,APR_HOOK_MIDDLE);
-    ap_hook_check_user_id(ftp_check_user_id, NULL, NULL, APR_HOOK_REALLY_FIRST);
     ap_hook_insert_filter(ftp_insert_filter,NULL,NULL,APR_HOOK_MIDDLE);
+
+#if ((AP_SERVER_MAJORVERSION_NUMBER < 3) && (AP_SERVER_MINORVERSION_NUMBER < 3))
+    ap_hook_check_user_id(ftp_check_user_id, NULL, NULL, APR_HOOK_REALLY_FIRST);
+#endif
 
     /* FTP filters */
     ftp_input_filter_handle = ap_register_input_filter("FTP_PROTOCOL",