svn commit: r232672 - in /httpd/mod_smtpd/trunk: README configure.ac smtp.h smtp_core.c smtp_protocol.c

[so...@apache.org]

Author: soc-rian
Date: Sun Aug 14 16:32:58 2005
New Revision: 232672

URL: http://svn.apache.org/viewcvs?rev=232672&view=rev
Log:
Applied patches, fixed bulid errors.

Removed:
    httpd/mod_smtpd/trunk/README
Modified:
    httpd/mod_smtpd/trunk/configure.ac
    httpd/mod_smtpd/trunk/smtp.h
    httpd/mod_smtpd/trunk/smtp_core.c
    httpd/mod_smtpd/trunk/smtp_protocol.c

Modified: httpd/mod_smtpd/trunk/configure.ac
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/configure.ac?rev=232672&r1=232671&r2=232672&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/configure.ac (original)
+++ httpd/mod_smtpd/trunk/configure.ac Sun Aug 14 16:32:58 2005
@@ -4,7 +4,14 @@
 AC_DEFUN([CHECK_VERSION],[dnl
 	min_apache_version=ifelse([$1], ,no,$1)
 	AP_BIN=`$APXS_BIN -q BINDIR`
-	our_apache_version=`$AP_BIN/httpd -v | grep -i Apache |
+	AP_SBIN=`$APXS_BIN -q SBINDIR`
+        AP_PROG=`$APXS_BIN -q PROGNAME`
+        if test -e "$AP_BIN/$AP_PROG"; then
+                AP_PATH="$AP_BIN/$AP_PROG"
+        else
+                AP_PATH="$AP_SBIN/$AP_PROG"
+        fi
+	our_apache_version=`$AP_PATH -v | grep -i Apache |
 			    sed -e 's/.*Apache\///' | tr -dc [^0-9.]`
 
 	AC_MSG_CHECKING(for Apache version >= $min_apache_version)
@@ -27,14 +34,16 @@
 		apxs_prefix="$withval",
 	)
 
-	if test ! -d $apxs_prefix; then
-	   apxs_prefix=`dirname $apxs_prefix`
-	fi			
+	if test -d $apxs_prefix; then
+	        apxs_prefix=`dirname $apxs_prefix`
 
-	test_paths="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin"
-	test_paths="${test_paths}:${PATH}:/usr/bin:/usr/sbin"
-	test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin:/usr/local/apache2/bin"
-	AC_PATH_PROG(APXS_BIN, apxs, no, [$test_paths])
+                test_paths="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin"
+                test_paths="${test_paths}:${PATH}:/usr/bin:/usr/sbin"
+                test_paths="${test_paths}:/usr/local/bin:/usr/local/sbin:/usr/local/apache2/bin"
+        	AC_PATH_PROG(APXS_BIN, apxs, no, [$test_paths])
+        else
+                APXS_BIN="$withval"
+	fi			
 	
 	if test "$APXS_BIN" = "no"; then
 	        AC_MSG_ERROR([*** The apxs binary installed by apache could not be found!])

Modified: httpd/mod_smtpd/trunk/smtp.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp.h?rev=232672&r1=232671&r2=232672&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp.h (original)
+++ httpd/mod_smtpd/trunk/smtp.h Sun Aug 14 16:32:58 2005
@@ -43,13 +43,13 @@
   } smtpd_handler_st;
 
   void
-  process_smtp_connection_internal(request_rec *r);
+  smtpd_process_connection_internal(request_rec *r);
 
   void
   smtpd_clear_request_rec(smtpd_request_rec *);
 
   apr_hash_t *
-  smtpd_get_handlers();
+  smtpd_get_handlers(void);
     
   HANDLER_DECLARE(ehlo);
   HANDLER_DECLARE(helo);

Modified: httpd/mod_smtpd/trunk/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_core.c?rev=232672&r1=232671&r2=232672&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/smtp_core.c Sun Aug 14 16:32:58 2005
@@ -262,7 +262,7 @@
   r = smtpd_create_request(c);
   ap_update_child_status(r->connection->sbh, SERVER_BUSY_KEEPALIVE, r);
 
-  process_smtp_connection_internal(r);
+  smtpd_process_connection_internal(r);
 
   return OK;
 }
@@ -345,8 +345,6 @@
   // register connection processor 
   ap_hook_process_connection(process_smtp_connection, NULL, 
 			     NULL, APR_HOOK_MIDDLE);
-  APR_OPTIONAL_HOOK(smtpd, queue, default_queue, NULL, NULL, APR_HOOK_LAST);
-  APR_OPTIONAL_HOOK(smtpd, rcpt, default_rcpt, NULL, NULL, APR_HOOK_LAST);
 
   smtpd_handlers = apr_hash_make(p);
 

Modified: httpd/mod_smtpd/trunk/smtp_protocol.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/smtp_protocol.c?rev=232672&r1=232671&r2=232672&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/smtp_protocol.c (original)
+++ httpd/mod_smtpd/trunk/smtp_protocol.c Sun Aug 14 16:32:58 2005
@@ -38,7 +38,7 @@
 
 #define BUFFER_STR_LEN 1024
 void
-process_smtp_connection_internal(request_rec *r)
+smtpd_process_connection_internal(request_rec *r)
 {
   apr_pool_t *p;
   apr_hash_t *handlers = smtpd_get_handlers();