svn commit: r371832 - in /httpd/mod_smtpd/trunk/src: mod_smtpd.h smtp.h smtp_core.c smtp_util.c

[so...@apache.org]

Author: soc-rian
Date: Mon Jan 23 22:07:40 2006
New Revision: 371832

URL: http://svn.apache.org/viewcvs?rev=371832&view=rev
Log:
Add module custom config vector for other modules to customize
in the main structures.


Modified:
    httpd/mod_smtpd/trunk/src/mod_smtpd.h
    httpd/mod_smtpd/trunk/src/smtp.h
    httpd/mod_smtpd/trunk/src/smtp_core.c
    httpd/mod_smtpd/trunk/src/smtp_util.c

Modified: httpd/mod_smtpd/trunk/src/mod_smtpd.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/mod_smtpd.h?rev=371832&r1=371831&r2=371832&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/mod_smtpd.h (original)
+++ httpd/mod_smtpd/trunk/src/mod_smtpd.h Mon Jan 23 22:07:40 2006
@@ -106,6 +106,9 @@
 
     /* filters in */
     ap_filter_t *input_filters;
+
+    /* notes on this envelope */
+    struct ap_conf_vector_t *envelope_config;
 } smtpd_envelope_rec;
 
 typedef struct smtpd_session_rec {
@@ -131,6 +134,9 @@
 
     /* bb out */
     apr_bucket_brigade *bb_out;
+
+    /* notes on this session */
+    struct ap_conf_vector_t *session_config;
 } smtpd_session_rec;
   
 /* public */

Modified: httpd/mod_smtpd/trunk/src/smtp.h
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp.h?rev=371832&r1=371831&r2=371832&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp.h (original)
+++ httpd/mod_smtpd/trunk/src/smtp.h Mon Jan 23 22:07:40 2006
@@ -49,7 +49,7 @@
 
 void smtpd_process_connection_internal(smtpd_session_rec *str);
 
-void smtpd_clear_trans_rec(smtpd_session_rec *);
+void smtpd_clear_envelope_rec(smtpd_session_rec *);
 
 #ifdef __cplusplus
 }

Modified: httpd/mod_smtpd/trunk/src/smtp_core.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_core.c?rev=371832&r1=371831&r2=371832&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_core.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_core.c Mon Jan 23 22:07:40 2006
@@ -47,7 +47,7 @@
 ap_regex_t *rcpt_compiled_regex;
 ap_regex_t *vrfy_compiled_regex;
 
-void smtpd_clear_trans_rec(smtpd_session_rec *scr)
+void smtpd_clear_envelope_rec(smtpd_session_rec *scr)
 {
     smtpd_envelope_rec *str = scr->envelope;
     apr_pool_clear(str->p);
@@ -60,6 +60,7 @@
     str->mail_parameters = apr_table_make(str->p, 5);
     str->rcpt_parameters = apr_table_make(str->p, 5);
     str->input_filters = scr->c->input_filters;
+    str->envelope_config = ap_create_request_config(str->p);
 }
 
 /* private methods */
@@ -145,6 +146,8 @@
     scr->protocol_type = SMTPD_PROTOCOL_UNKNOWN;
     scr->helo = apr_palloc(scr->p, 256);
 
+    scr->session_config = ap_create_request_config(scr->p);
+
     /* create envelope rec */
     str = apr_pcalloc(scr->p, sizeof(*str));
     
@@ -152,7 +155,7 @@
     str->p = sp;
 
     scr->envelope = str;
-    smtpd_clear_trans_rec(scr);
+    smtpd_clear_envelope_rec(scr);
         
     return scr;
 }

Modified: httpd/mod_smtpd/trunk/src/smtp_util.c
URL: http://svn.apache.org/viewcvs/httpd/mod_smtpd/trunk/src/smtp_util.c?rev=371832&r1=371831&r2=371832&view=diff
==============================================================================
--- httpd/mod_smtpd/trunk/src/smtp_util.c (original)
+++ httpd/mod_smtpd/trunk/src/smtp_util.c Mon Jan 23 22:07:40 2006
@@ -41,7 +41,7 @@
    */
     smtpd_run_reset_envelope(scr);
 
-    smtpd_clear_trans_rec(scr);
+    smtpd_clear_envelope_rec(scr);
 }
 
 SMTPD_DECLARE_NONSTD(apr_status_t) smtpd_getline(smtpd_session_rec *scr,