From b477dd843c51ff9c744f769124bb03607472ab0c Mon Sep 17 00:00:00 2001
From: bagyenda <>
Date: Mon, 18 Aug 2008 07:16:17 +0000
Subject: [PATCH] *** empty log message ***

---
 mbuni/bootstrap           |  4 +++-
 mbuni/doc/userguide.shtml |  2 +-
 mbuni/mmlib/mms_mm7soap.c | 21 ++++++++++++---------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/mbuni/bootstrap b/mbuni/bootstrap
index bb699c8..c328e48 100755
--- a/mbuni/bootstrap
+++ b/mbuni/bootstrap
@@ -4,7 +4,9 @@ set -e
 
 # Check for automake
 amvers="no"
-if automake-1.9 --version >/dev/null 2>&1; then
+if automake-1.10 --version >/dev/null 2>&1; then
+  amvers="-1.10"
+elif automake-1.9 --version >/dev/null 2>&1; then
   amvers="-1.9"
 elif automake-1.8 --version >/dev/null 2>&1; then
   amvers="-1.8"
diff --git a/mbuni/doc/userguide.shtml b/mbuni/doc/userguide.shtml
index eca7490..d08c4fa 100644
--- a/mbuni/doc/userguide.shtml
+++ b/mbuni/doc/userguide.shtml
@@ -2636,7 +2636,7 @@ faked-sender = 100<br>
 
  <tr>
   <td  valign=top >
-  <tt>deliver-report-url</tt>
+  <tt>delivery-report-url</tt>
   </td>
   <td  valign=top >
   string
diff --git a/mbuni/mmlib/mms_mm7soap.c b/mbuni/mmlib/mms_mm7soap.c
index 15c8b08..ec16778 100644
--- a/mbuni/mmlib/mms_mm7soap.c
+++ b/mbuni/mmlib/mms_mm7soap.c
@@ -1051,10 +1051,6 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
 			       isclientside ? "SenderAddress" : "Sender", 
 			       octstr_get_cstr(xfrom));	  
 
-	  if ((s = mms_get_header_value(msg, octstr_imm("Date"))) != NULL) {
-	       http_header_add(m->envelope, "TimeStamp", octstr_get_cstr(s));	       
-	       octstr_destroy(s);
-	  }
 
 	  if (isclientside) {
 	       if (vaspid)
@@ -1067,11 +1063,6 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
 		    octstr_destroy(s);
 	       }
 
-	       if ((s = mms_get_header_value(msg, octstr_imm("X-Mms-Expiry"))) != NULL) {
-		    http_header_add(m->envelope, "ExpiryDate", octstr_get_cstr(s));	       
-		    octstr_destroy(s);
-	       }
-
 	       if ((s = mms_get_header_value(msg, octstr_imm("X-Mms-Delivery-Report"))) != NULL) {
 		    char *val = (octstr_case_compare(s, octstr_imm("Yes")) == 0) ? 
 			 "true" : "false";
@@ -1101,6 +1092,18 @@ MSoapMsg_t *mm7_mmsmsg_to_soap(MmsMsg *msg, Octstr *from, List *xto,
 		    http_header_add(m->envelope, "UACapabilities", octstr_get_cstr(xuaprof_val));	       
 	  }
 
+	  if ((s = mms_get_header_value(msg, octstr_imm("Date"))) != NULL) {
+	       http_header_add(m->envelope, "TimeStamp", octstr_get_cstr(s));	       
+	       octstr_destroy(s);
+	  }
+
+	  if (isclientside) {
+	       if ((s = mms_get_header_value(msg, octstr_imm("X-Mms-Expiry"))) != NULL) {
+		    http_header_add(m->envelope, "ExpiryDate", octstr_get_cstr(s));	       
+		    octstr_destroy(s);
+	       }
+	  }
+
 	  if ((s = mms_get_header_value(msg, octstr_imm("X-Mms-Priority"))) != NULL) {
 	       http_header_add(m->envelope, "Priority", octstr_get_cstr(s));	       
 	       octstr_destroy(s);